Sync with portage [Thu Oct 15 00:03:51 MSK 2015].

9 years ago · 549a8eb96c
parent 917b11e217
commit 549a8eb96c
1390 changed files with 4441 additions and 8543 deletions
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@ -1,8 +1,8 @@
 DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec770ede73048ba7a6df113a6948 SHA512 aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d WHIRLPOOL e8f6a421c64eb1bf6f2d97910e4687b00cf794fd27c8aff83ce9d39e18393cccca1984e73a44110ff5e87427fd0ed74963dcb997490d97614116800100daca5b
-DIST homebank-5.0.0.tar.gz 2553476 SHA256 28d4342d989997ce63acdf5b92354f6142bb6d87d57fc37dd7610beb73305918 SHA512 85fbd42658c5427a69d69b11394ba5d7a4eedf05ab6b480399a5bf253822175f91eeac874b271b816b7bd44a387f40fd6c686f791b3575f5cf02465fd10a50a2 WHIRLPOOL ea46a06b7f08b85976d9b1c61843188bc2f9dd2e5075707be263f46eed8719ccc1aca15c246276972f7fc6fbf707c9e5364da334869cc166c8eb43445398c504
 DIST homebank-5.0.3.tar.gz 2551525 SHA256 eac04a19f5d7644a5bf254a22f737d562b41503f280e339192f39745bf0d7839 SHA512 727802950570aac29c9a578c6332cad3cf4c9d71a8f059db9ff4acec7fca5e85148b4aad8eea825dcf76cf751e44b4ab94be5c6c70fa09b0ddc7d40948ea4ac5 WHIRLPOOL 937f3734e97d3294633192dab593c1042ea550eb1fce70b85f37c3980eef65c1a63a392da86bfe9bcebab77efa556a77db3eeef21b41e637eed4e29a0d6cfa5c
+DIST homebank-5.0.5.tar.gz 2554967 SHA256 67c47709517d325fc8d601bb8552e3c8a1ad3b820a2c0a403ed20f00c795903c SHA512 9e23565041de9a4b4f7cf6374618022d89b99119d54a6375a17880e4cb284f7af7e83bef7d58b943c107d28ac56751987960a17e2bf2cc0a3e0c10d6442a40ed WHIRLPOOL 8423d22687bc7851c4d51ccc88a1a4ade53eb813875beae7bf2137a209c57b3d08c63eebceed963f91db78f07cbba9a46dcb3fce68999b62fbbd55c826ddc1b5
 EBUILD homebank-4.6.3.ebuild 846 SHA256 12fa3c573e0eae7622fb032e73df15b76ad8a42e644c87a3da83b6c25c184193 SHA512 54ebc50bf7809e713c7c88a6940b88a49ccf94e69f957a1f247dc1a9364fa07883024d74d3a69caf8d74b012e08c4c36488fd466391649fbd681d2019f50dbcb WHIRLPOOL 980862932bb2ec4bb81b43572c632a95e1082c6028ef3454b7c27738beb5ff0516f67b2e34733fb02556a39765971713de664464c89717ca0412497376c8f210
-EBUILD homebank-5.0.0.ebuild 893 SHA256 760250d7852d2d30afb42fdf83816e46ebc600a6196cca57af0b140ac43f050f SHA512 1b5c2fa99612d22ff51a9d4306ddb6cc152d4fd862d6c877afd1c80d19393136a8f7e0c09814056f6f713d176bef5675fe5bf35682e78e09f035da0478d63c58 WHIRLPOOL 41e98f1855585661658ad0cc82dbce05a0a4bca6020d9b865a3981baf96fad5099a3419f97f41e7c664dcf7780060bfdffe5d16668cf737d1bc101ad32a225da
 EBUILD homebank-5.0.3.ebuild 893 SHA256 760250d7852d2d30afb42fdf83816e46ebc600a6196cca57af0b140ac43f050f SHA512 1b5c2fa99612d22ff51a9d4306ddb6cc152d4fd862d6c877afd1c80d19393136a8f7e0c09814056f6f713d176bef5675fe5bf35682e78e09f035da0478d63c58 WHIRLPOOL 41e98f1855585661658ad0cc82dbce05a0a4bca6020d9b865a3981baf96fad5099a3419f97f41e7c664dcf7780060bfdffe5d16668cf737d1bc101ad32a225da
+EBUILD homebank-5.0.5.ebuild 999 SHA256 a119e1d0806697d311744db23469fa6772e141e5587df9ebef2e3b8d5e47e65f SHA512 1510b0ef84ffe20e2c213c6573b64a19b1722bfd2b35ee088819e8b0c2e2c4e27b2fb2d1225ac509cdaca6c78c637298e6c50c8729097c0586e8b78aeafaa7c7 WHIRLPOOL da6545114b4e49e53fe68894582c4b2e5a5842355f9fd25027ae91d277ac2ea0b77543e9dea4e3b923a9578b825abc2ff075ed557e3b0a8e7975a397dd1a06e7
 MISC ChangeLog 6246 SHA256 810e5cf28a594c841a29cc70046828a4c4aa66fc43953c9857845e6fc6b183aa SHA512 caea26e2aeb9f1c68df359e80c9a15ac9594129f125639289d031427a0817ad5ccdc4ca117972af5c84bffe310941d5205ec7e76579ca9e48d1baa6f4f9c0afd WHIRLPOOL 48ffd4c1f958857209d2e638531317d134178368a8a19ff7bda3204509295fc435b95de0488bc884b7eb9e2ce695f43c0a09002bd1ddc4ac9f7e2ef569e02401
 MISC metadata.xml 232 SHA256 18d82999ae63f6a95f78867cc239598fd2eb8011c837dcbe85830d022e7e6aea SHA512 7f9c9b67138a1ba31721ed3109989340b3373d6732b9c26769600ffc10c3810cb7ad3bf32f5a9065b543877e432950517e72d095370aa3179712aefbebb03175 WHIRLPOOL 0c633ba84a00eaa0119ea39672a3b841c2c5a667781aa82a56494e23e7ecd4965ac75e152a2f93477e7b272c4b8c025821e07a02683e67cf33e6fbffd138579b
--- a/app-office/homebank/homebank-5.0.5.ebuild
+++ b/app-office/homebank/homebank-5.0.5.ebuild
@ -4,7 +4,7 @@

 EAPI="5"

-inherit fdo-mime eutils
+inherit fdo-mime eutils gnome2-utils

 DESCRIPTION="Free, easy, personal accounting for everyone"
 HOMEPAGE="http://homebank.free.fr/index.php"
@ -33,12 +33,18 @@ src_configure() {
 	econf $(use_with ofx)
 }

+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }

 pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@ -0,0 +1,5 @@
+AUX 2.7.7-gcc.patch 402 SHA256 0f4fd388d1275dbd5b9e5df1f4814bad1a21d7f9efea844b02248db00acdb5f8 SHA512 c94a8fcdce09f5a7cb32c2594728954775812a5eb2487aebe4f1e9203e5db75e391a2214fdb173f33f8616ac5b666e2d4653bc00a3a98b09005333ed2a3b27fd WHIRLPOOL 1b7ab5a84d974752d48a88212f6bdb1d84335516d73b97c5d4fc5674907c11ea4c7a8eccb86f40a9c084bec9b9e01783f8feab92c9e0bc018897b3d53e1ba63f
+AUX 2.7.7-libtool.patch 621 SHA256 142c7a38900a89580a9485508c885b0268acf503d283f3af6f6c2d3333fb9c4e SHA512 3f1d68eff40fac13a4f482724456cb8ed801feff71a254871368f22ab98024431c718f3fb35f13da4183bdebe62ece26908a341fe1a945118bf0d78f5d8ea622 WHIRLPOOL a94319f02231a50a2ab827fb2ca68076288655cb6e636e6cc703ad9abddcc63ea2abdde567698946929983e65b83218de05fd2f3e05f087201b705766c7e5901
+DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
+EBUILD antlr-cpp-2.7.7.ebuild 2729 SHA256 0bc110762d4369fad93168604bc1c1403a521eaaf5aa35ae79e2d413adc5ee2c SHA512 a0d64c54dc63ad454d87214f47f999bcfd47956e3d5aa137d80f97329211d57c71eecaf3c45a030c6f0c3436455ac094a05afaea4fa75fb6ebb178b45e49616d WHIRLPOOL a23762c3e80094fe77a518a7803cdeb429165b71722cd3b0d295b78e8b1a814ad38e821478b892dd21a4d6fba6c66f3e68c7eb0a59b35595aa590f0552d855ec
+MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Upstream only installs a static library. The original antlr ebuild
+# built a shared library manually, which isn't so great either. This
+# ebuild applies libtool instead and therefore an autoreconf is
+# required. A couple of errors concerning tr have been seen but the
+# final result still looks good. This also sidesteps bug #554344 plus
+# the need to call einstall.
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils autotools-multilib
+
+MY_P="${PN%-cpp}-${PV}"
+DESCRIPTION="The ANTLR 2 C++ Runtime"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="!!dev-java/antlr:0[cxx]"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-{gcc,libtool}.patch
+
+	mv -v configure.in configure.ac || die
+	mv -v aclocal.m4 acinclude.m4 || die
+
+	# These silly test -z lines break badly under recent autoconfs.
+	sed -i '/AC_PATH_PROG/s/test -z "\$[^"]*" *&& *//' configure.ac || die
+
+	# Delete build files from examples.
+	find examples -name Makefile.in -delete || die
+
+	# Fix make invocations. See bug #256880.
+	find -name "*.in" -exec sed -i 's/@MAKE@/$(MAKE)/g' {} + || die
+
+	# Turn Makefile.in files into libtool-style Makefile.am
+	# files. Countable.hpp is actually missing.
+	local HPP=$(grep -E -o "\w+\.hpp" lib/cpp/antlr/Makefile.in | grep -v "Countable\.hpp" | tr "\n" " " || die)
+	local CPP=$(grep -E -o "\w+\.cpp" lib/cpp/src/Makefile.in | tr "\n" " " || die)
+
+	cat <<EOF > lib/cpp/antlr/Makefile.am || die
+antlr_includedir = \$(includedir)/antlr
+antlr_include_HEADERS = ${HPP}
+EOF
+
+	cat <<EOF > lib/cpp/src/Makefile.am || die
+AM_CPPFLAGS = -I\$(abs_top_srcdir)/lib/cpp
+lib_LTLIBRARIES = libantlr.la
+libantlr_la_LDFLAGS = -version-info 2
+libantlr_la_SOURCES = ${CPP}
+EOF
+
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-csharp
+		--enable-cxx
+		--disable-examples
+		--disable-java
+		--disable-python
+		--enable-verbose
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-multilib_src_compile
+
+	if use doc; then
+		cd "${S}/lib/cpp" || die
+		doxygen -u doxygen.cfg || die
+		doxygen doxygen.cfg || die
+	fi
+}
+
+multilib_src_install() {
+	# We only care about the C++ stuff.
+	emake -C lib/cpp install DESTDIR="${D}"
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	cd "${S}" || die
+	use doc && dohtml -r lib/cpp/gen_doc/html/
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/cpp/*
+	fi
+}
--- a/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch
+++ b/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch
@ -0,0 +1,12 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp	2006-11-01 21:37:17.000000000 +0000
+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp	2015-10-06 23:01:53.083655950 +0100
+@@ -10,6 +10,8 @@
+ 
+ #include <antlr/config.hpp>
+ 
+#include <cstdio>
+#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
--- a/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
+++ b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
@ -0,0 +1,21 @@
+diff -Naur antlr-2.7.7.orig/configure.in antlr-2.7.7/configure.in
+--- antlr-2.7.7.orig/configure.in	2006-11-01 21:37:18.000000000 +0000
+++ antlr-2.7.7/configure.in	2015-10-11 13:49:09.166308712 +0100
+@@ -13,6 +13,9 @@
+ AC_CONFIG_SRCDIR([LICENSE.txt])
+ AC_CONFIG_AUX_DIR(scripts)
+ 
+LT_INIT
+AM_INIT_AUTOMAKE
+
+ ## This shall be the very first config file. Do not change
+ ## this.
+ AC_CONFIG_FILES([scripts/config.vars])
+@@ -841,7 +844,6 @@
+ AC_PROG_RANLIB
+ 
+ test -z "$MKDIR" && AC_PATH_PROG(MKDIR, mkdir$EXEEXT, mkdir$EXEEXT )
+-test -z "$RM"    && AC_PATH_PROG(RM,    rm$EXEEXT, rm$EXEEXT )
+ 
+ AX_PATH_PROGS(
+   [TAR],
--- a/dev-cpp/antlr-cpp/metadata.xml
+++ b/dev-cpp/antlr-cpp/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@ -12,7 +12,7 @@ DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cf
 DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
 DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
 EBUILD antlr-2.7.7-r5.ebuild 4541 SHA256 aa6b9482007ce417a9ee77abab7985335e1d8205a72dddd4bd42646f10556a47 SHA512 71bc19dd9a0e6f08d890b76ce5cb80696421acdfea0f5e68af5c999bc5bdfe87bd0a8ebe48f1e3dc2a089029a2600a0764841633378535e44f23056c4473f11d WHIRLPOOL 078fb1be3230db89b4a10d6a3f57100c50731e90a56eca8beac922bd7683b0c5e13d125d1676f502e641c0b79bc50b370753292fe2ab44531102ea97092fcd00
-EBUILD antlr-2.7.7-r6.ebuild 4572 SHA256 1ba092527699bf93ec038b992447550a229e245e420c65cc2cbe4c3564792260 SHA512 cc53c74ed1e7930b2f2558e141877d4604be27fe0a3cf54dea0ad1e98b4107aa8ae782254276f1e6a2e0b5e846f2d17c18eaab30cd24c2fdd1957604be713f38 WHIRLPOOL 5eb9214aa9f67ed001fec0eafa071d3fb586711093f71b7ee91e0ae765eebe5ffecdfccb89097ebb67676b6ddb7814a14a271c2214e207cb703d3b9d80abd0bb
+EBUILD antlr-2.7.7-r7.ebuild 1138 SHA256 e1deeb63d4cf00197420b3201a7811cd55c1b2f1be213be69b322cd8d412ed35 SHA512 bc3a846ad7107397b271028dd898bd51ca62e908c9eacbee8170c9add1a18198a4ccdc97e2b8ce6ba76ccb816915ed22d1ee5230a264e6941e3384a81a1f083e WHIRLPOOL 4613640b4d8d511b4936aa43e40d65a6968c0537d31153d649314556e14c84d8d3e483c147e7e2845c008d0ae7e0340b07641c028e8a294c9637c1247bda417a
 EBUILD antlr-3.1.3-r3.ebuild 3431 SHA256 d9c34a534496a44c407a6421d1be2ae51907b787f1b738f308ab29a453c3b624 SHA512 1a98ed10a2f244742609a173a1dc4f7bdf30e22fae7d0ffbda2ed2b31aaa0dff092cea4136994d0ec94c2f258f2352682bdaed1b7d7bf92644a27ffea77ee843 WHIRLPOOL 9a16128bc77e7284657c8e620e25adbe3ae9cb8c307449296521cf8b1d013e618b05ac09f768520dfbc09d9d58c6b58d8f7ba3224e9030fd54387b0db9758849
 EBUILD antlr-4.4.ebuild 1689 SHA256 5a36e61d7e6386ce58a76fb9c460ba0fd24aa44c2935260bc55c8c93c099dd6e SHA512 7681349932ce25701ca0f384f257511ca135add475777f648c91ccc8bb6eeff15ced066dc3a118e1f4e738eee5df9649863ddee0f0a2e8645ae9c50fc5cf304b WHIRLPOOL 461342effa34ad79b5a96c94aa58fcee1efad71888b770f4b3977cd493ad253a8cf0381b122e71078bb4696f97f28b28752b642fe81f4ff4f7a1ad744940f696
 MISC ChangeLog 16936 SHA256 5dbbce05d4b62d117a5cf5672ab4ddb30c31ff3a961db968477271d8342eb7c0 SHA512 9b807d940667545f211673047baf5fca4452643575f2512fc8976d9560e718f5abe893fc65e3a03432a74fb81ba0312bb462f56834e547b04280108e2b567f65 WHIRLPOOL 0e912f06b0329ff076e0f92876d7f105bd9f43a63ef5929d21aac05e67bc9f920941674edb671f3f407fd5093368e3f0f373e7d45225832801e81270a13b9424
--- a/dev-java/antlr/antlr-2.7.7-r6.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r6.ebuild
@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=virtual/jdk-1.6
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.15
-	script? ( !dev-util/pccts )
-	source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
-	einfo "Making ${soname}"
-	[[ ${CHOST} == *-darwin* ]] \
-		&& make_shared_lib_macho "${soname}" "$1" "$2"\
-		|| make_shared_lib_elf "${soname}" "$1" "$2"
-}
-
-make_shared_lib_elf() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-make_shared_lib_macho() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
-		-force_load "${archive}" \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i \
-		-e 's/install:.*this-install/install:/' \
-		lib/cpp/src/Makefile.in || die
-
-	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
-
-	# See bug #468540, this can be removed once bug #469150 is fixed.
-	sed -i 's/tlib lib ar/ar/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# don't ask why, but this is needed for stuff to get built properly
-	# across the various JDKs
-	JAVACFLAGS="+ ${JAVACFLAGS}"
-
-	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-	CSHARPC="mcs" econf $(use_enable java) \
-		$(use_enable python) \
-		$(use_enable mono csharp) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable cxx) \
-		--enable-verbose
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS} -fPIC"
-	if use cxx; then
-		pushd lib/cpp/src > /dev/null
-		make_shared_lib libantlr.a || die
-		if use static-libs; then
-			make clean
-			emake
-		fi
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dobin scripts/antlr-config
-
-	if use cxx ; then
-		pushd lib/cpp > /dev/null
-		einstall
-		dolib.so src/libantlr$(get_libname $(get_major_version))
-		dosym libantlr$(get_libname $(get_major_version)) \
-			/usr/$(get_libdir)/libantlr$(get_libname)
-		use static-libs && dolib.a src/libantlr.a
-		newdoc AUTHORS{,.cpp}
-		newdoc ChangeLog{,.cpp}
-		newdoc TODO{,.cpp}
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		java-pkg_dojar antlr/antlr.jar
-		use script && java-pkg_dolauncher antlr --main antlr.Tool
-		use source && java-pkg_dosrc antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		pushd lib > /dev/null
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-		sed -e "s|@prefix@|${EPREFIX}/usr|" \
-			-e 's|@exec_prefix@|${prefix}|' \
-			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
-			-e "s|@VERSION@|${PV}|" \
-			"${FILESDIR}"/antlr.pc.in > antlr.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins antlr.pc
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use examples ; then
-		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-		insinto /usr/share/doc/${PF}/examples
-		use cxx && doins -r "${S}"/examples/cpp
-		use java && doins -r "${S}"/examples/java
-		use mono && doins -r "${S}"/examples/csharp
-		use python && doins -r "${S}"/examples/python
-	fi
-
-	dodoc README.txt
-}
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples source"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="${S}/${PN}"
+
+java_prepare() {
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+src_configure() {
+	: # Avoid configure script.
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+	dodoc {CHANGES,README}.txt
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+}
--- a/dev-java/htmlparser/Manifest
+++ b/dev-java/htmlparser/Manifest
@ -1,5 +1,5 @@
 AUX build.xml 559 SHA256 dc9ff4e15a7735237897d560d34ee7aa82d46c3cd51793a9743185b203ed366a SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a WHIRLPOOL 55ecec03371a44d84f7fde5928a47ab67bee2e82f3599ecde304383be0bc62620f17290195257656f85344011b09ec9aaa54cb2ed4eadea8d53c27e96679cd5f
 DIST htmlparser-1.4.zip 1425388 SHA256 4e696a17f25a6983c846bb72b8f4e1920659d6a1677d5620eff60417260b586c SHA512 eb0587c808b287bbb18acbba11e8efe5bd0dededd96f6bf34ef59b92144227cf8368bf76474a2c1d87a5d6b635a63057faa9d18e2a1a2d7dfeacbfaa64e57700 WHIRLPOOL ae5de0f11b294ce7c831c1e4e121e0f4d2fe354883de3f83ed33c930180bb73f4d224edfbf75754c0d560946b6cddc03d71551f7219472a71d8952a71cf7c8b9
-EBUILD htmlparser-1.4-r1.ebuild 933 SHA256 2dd10c5f5f0ac350d95eeaba2f0fc6c77dd9eaa26f246a249c8d8ea3400eee05 SHA512 7aa64dc678ed2b3e40307d48e11e89a0b046d22398da1965c7ed21de59d5be703b5c7e54e20184234cfea3264cccf5d9a4438471e23d687a7cf35c634d7c7af8 WHIRLPOOL fd91e4774fc812ca4936f3f4e4d60f05958d2b25fde2f1c99856dd066d5a51101f95287c818d7c2c8319342a3d121bbc2a1be4bd3c47682f4e044334f3c9928a
+EBUILD htmlparser-1.4-r1.ebuild 887 SHA256 dde9e2a9534e665c1b89b2c9aeee19a0e94d209049633bd6e0ec83ea2393da93 SHA512 fd8f4e7a9eb24dad2388849e42e7787cbc04b88d55158023d99de42de60793aae9c3bcece837223f70e3996c696c24d5268e1c0c7fcac73e0c4ebc8978427dc5 WHIRLPOOL f549dbc4d0fce2126737ad668b0f2bcb5c1f0f3510dfa73bf2a20e1d83803129ef5d6bcadba41d49d2917cad425d3ef464f790b22905334af491a7e5d8c19965
 MISC ChangeLog 897 SHA256 7930056b9646f10586edfd4038f95131983521e172e6d41ecb193c5f072c8955 SHA512 dd4334d1edd8386cfca092c8cc7d9128d12744ff7eee4572eae7231b52240f3c755c21d5de1487240235fea9de04f5389595aa74d1692c5e0e1bac509abc98b9 WHIRLPOOL 3f10a3206a610907701a0e739a4c19fa834192aed73df6dd33ae2f7209fe2029f69bb5d505393ed1b5749affa187fd8728e9c6e1b634edee35b212aaae59d8c8
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
--- a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@ -17,29 +17,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-COMMON_DEP="
+CDEPEND="
 	dev-java/icu4j:52
 	dev-java/jchardet:0
 	dev-java/xom:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
 	app-arch/unzip"

 java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -delete || die
+	java-pkg_clean
 	mkdir -p build lib || die
 	cp "${FILESDIR}/build.xml" build.xml || die "cp failed"
 }

 JAVA_ANT_REWRITE_CLASSPATH="yes"
-
 EANT_GENTOO_CLASSPATH="icu4j-52,xom,jchardet"

 src_install() {
-	java-pkg_dojar htmlparser.jar
-
+	java-pkg_dojar "${PN}.jar"
 	use source && java-pkg_dosrc src/*
 	use doc && java-pkg_dojavadoc docs
 }
--- a/dev-java/jchardet/Manifest
+++ b/dev-java/jchardet/Manifest
@ -1,5 +1,4 @@
-AUX build.xml 559 SHA256 dc9ff4e15a7735237897d560d34ee7aa82d46c3cd51793a9743185b203ed366a SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a WHIRLPOOL 55ecec03371a44d84f7fde5928a47ab67bee2e82f3599ecde304383be0bc62620f17290195257656f85344011b09ec9aaa54cb2ed4eadea8d53c27e96679cd5f
 DIST jchardet-1.1.zip 82782 SHA256 2d83cd7a24a5a5c1cbf02f649008b0d792f5e4bc11e18a7df8ce4f885bc8650a SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28 WHIRLPOOL 4dbc0af21024b9da7d332cd2cb6c9103300a2618b189e4cbe97ad574b328db4727db60ec008f0c09b316d1d27c68371a33645d6a4dd1703f6cd906af3376dff4
-EBUILD jchardet-1.1.ebuild 746 SHA256 5d81adacd98253d7f277844af5955562f58e76b029b9ae76c5faab5d755693c6 SHA512 75ea8459a1584eb5a4cc7706fdb9db05a8dbd25e993f6e865fdb0ca1c099e109fa5850d86e8a68edc4c9c2655865ad6ae9c0d20de64eff2bda62a4ae94c27f78 WHIRLPOOL 1353c71f0679d3a00bace17374ba23f3d491e7b1219eb1da094afe1bdc804723ba1840d9748508c0153575fabbf5635b0eb013d847773a374cc7bbf48036fba1
+EBUILD jchardet-1.1-r1.ebuild 563 SHA256 43a7b9c30c4bd65a72918371adb58c0388d7c220921bf5ff2ed3349a1c1e646c SHA512 8aa418ab67edfb19f5ecc56a96af5a68a7d089c37fbfa0ab79f7aade16a8ba1bcb2afc48893195529dbd235399086a35e7d7aa6ebd1d935860668db07dd4693e WHIRLPOOL 1090ee54bbb49362f2f133c5e94364d3dd75b96c6546707ca5fac8d45de3dca8d69ac418b825d3e1e899dbd979fd901aa8e672d222dc449e76483f3e5527afee
 MISC ChangeLog 633 SHA256 aec8988e050edda33618a5b3d9dca6c4bdaedfe432be15b218add650773610b4 SHA512 c5599085b7a58c50aa356032e934587a9050592a2121f96fe9eb25134b9d987ba26955cad4f099f67a680b71d215534394769460e3fb06a36e334b1ea3718bbe WHIRLPOOL f2813614d59cecdb57ee8c87922b760969b41d4ad03969796744e607aa5dbc47623ef73373393c72d061707547bd3b2706ef355606e1928c16a66e67c0216cc4
 MISC metadata.xml 236 SHA256 d9214447109c3d6ca9f9ce8a986394625d2d887bcd52c97d0bb8d536372dc52f SHA512 d0aba7aaaff1d79be639ab36ec99edf40368ef1141eef290f026d7cdee355d93ae151776c5e1d2480ccd4c2a4fcaa44a1028e5e868d7bfe474215d9c5e8e8113 WHIRLPOOL 84ec9e9b71d66c0bd504ce5da0df02c2cf523bba7e87e605785dd0aaf1674da63e4ca5906d23295dc8aa2f9a4896ef5041500ca8759771dd4c6bec8c3af83368
--- a/dev-java/jchardet/files/build.xml
+++ b/dev-java/jchardet/files/build.xml
@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project name="htmlparser" default="jar">
-	<path id="build.classpath">
-		<fileset dir="lib/">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="src" destdir="build" classpathref="build.classpath"/>
-	</target>
-	<target name="jar" depends="compile">
-		<jar destfile="htmlparser.jar" basedir="build"/>
-	</target>
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="src" destdir="docs" classpathref="build.classpath"/>
-	</target>
-</project>
--- a/dev-java/jchardet/jchardet-1.1-r1.ebuild
+++ b/dev-java/jchardet/jchardet-1.1-r1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
+HOMEPAGE="http://jchardet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
--- a/dev-java/jchardet/jchardet-1.1.ebuild
+++ b/dev-java/jchardet/jchardet-1.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
-HOMEPAGE="http://jchardet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-EANT_BUILD_TARGET="dist"
-
-src_prepare() {
-	rm -f dist/lib/chardet.jar
-
-	mkdir -p src/org/mozilla/intl/chardet/ || die
-	mv src/*.java src/org/mozilla/intl/chardet || die
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/chardet.jar
-
-	use source && java-pkg_dosrc src/*
-}
--- a/dev-java/jsr101/Manifest
+++ b/dev-java/jsr101/Manifest
@ -1,6 +1,4 @@
-DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
 DIST jsr101-1.4.tar.bz2 18614 SHA256 2f2e793c0ece7240d7b117e2f05eb4b32d29e7fa7b2fbf85d912fb8693b0a55e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317 WHIRLPOOL ad710d84c000f7711d0bcc3d93071160bb85daa0a854ade778ad3e636b49860a25739bd8e175b7c4a2a1b19f6c59451c0781b6b59f8331ce87cfb1c589d1e8f3
-EBUILD jsr101-1.4-r2.ebuild 973 SHA256 6c5c82c2e2dca374cfeeae01af7260d5e428165265bbc1c8fccc17e5d8fc5673 SHA512 b9e4e25fdb101000ec2eff64c47facbad4d430ffce62d5406ae591f8ef6122ac8ed43a687ddc2d80a1a2c1f15bb14b0a1cb41f5948e3d63bde3d2a71bfcfca2b WHIRLPOOL f829b0f4b3588977298f84bc4d69bbcf1af5cf83e65b04d44a88874d4fd706fd66abc737631cdf2b55f1bcae335bad81def0a2b204f8bfd1bcda8a045996332c
-EBUILD jsr101-1.4-r3.ebuild 694 SHA256 983056df6e4d0bee39921c6c5f7a020bc25242f3247716105065a80cf6167a03 SHA512 623a5488124f1eb2b2a9db9dedc9f026dd01b8e51c31dc1e68abb8e20b76fd47754c2a5afe40ce2c23df4d3a08041fed4f6d0e59b7ac0892424d8a0e238551c7 WHIRLPOOL 1800179c3b0b6740bd771a425f46bad33f91825e46933aa7bd3694b1fc4ebf20ea2f50b6b580d65a9ee604093ff01e03f1bc368feb77f18dd85fb52910093200
+EBUILD jsr101-1.4-r3.ebuild 691 SHA256 0e62cdcea80467c589f78aa757309301bd11685289c22ffe43cca0f562e34544 SHA512 cbc68fdede68adec7a3bbdfe14a0a7c1a060ff51681a0d4933dd8f6b528a6b7abf15bee6af8dc7112e5a5bc5f2ec341d37f00dc7b40e556e828e7ee118033355 WHIRLPOOL 405d07b3e4e9211787fc3858a42fab763c41d63b9d4d13ccf6651a56e0ce580767f3f0d50abe9d134150def8bf73b7da446f719dcf05de6e4840ca0299bf405f
 MISC ChangeLog 1832 SHA256 d796eae101706f5589cd572350867ac8dc05c7ea5f86611abba14b46fe95583f SHA512 0a9e676c50b63252c0ea1f35f4bacf3f2a1f3afb581c0e1a9ed4d0d53268b4b52c6886b0d176e8cad4f82c6584b8c5cef24bd02ab6e8c66a624d97a13dcfa13f WHIRLPOOL 089bdd33cdb53c923284bc5e39459d42f28dc4111f44810e7c725b490b4c9035fd574badc066a56a3947b0c997625acc39f3f5ca315a4906560c652db6bea0e1
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
--- a/dev-java/jsr101/jsr101-1.4-r2.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-r2.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE=""
-
-inherit versionator java-pkg-2
-
-DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
-HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
-MY_PN=axis
-MY_PV=$(replace_all_version_separators _)
-SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-IUSE=""
-
-CDEPEND="java-virtuals/servlet-api:2.5
-	java-virtuals/saaj-api:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_compile() {
-	mkdir build
-	ejavac \
-		-classpath $(java-pkg_getjars servlet-api-2.5,saaj-api) \
-		$(find src/javax/xml/rpc -name "*.java") -d build
-	cd build
-	jar cf jaxrpc-api.jar $(find . -type f) || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-}
--- a/dev-java/jsr101/jsr101-1.4-r3.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""

 CDEPEND="
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@ -1,20 +1,8 @@
-AUX 0.9.2-antlr.patch 2795 SHA256 9649cb996e771b7259cb81af75e3e1f555a003c3da0e2a21f4c7171e399703b9 SHA512 67bccd977def9b5581aca18a33dcfde6c563ecf404ddd31e2f306bd29801db9a47dcb78490bd7123f2c0179135d04fb0fa380b2d2f0161724827687a00c8f286 WHIRLPOOL 193e94b19365b1974f8a4fa858eceb766b9748a6c792b3b25c9becb19e9f8d018e05b8373dcc33127ecbfcf724c2327daf71d473be642e13dbc2bfbfe0046e0c
 AUX 0.9.2-include.patch 314 SHA256 6f9c9aaac6f9ee526c1cdd5eb107bfa28eecefa9f4a7f947e5f80cf6bb7591c7 SHA512 3dc426de776f004b9c9840f37af0002907036b6f9d370535c51a2ed6916156d34d640214bec2dba58c9553917c16b996b61194bf15bb3e1c6f2b6f81edb13a4c WHIRLPOOL f56a8f64ca50578f12b66b40687b074a37731c5e08422a4d30e9b96ae4e4cd3ee07e2672fb06ad14b1a37a197b915a9e09992ad56b20cb3b16e673160e042124
-AUX 0.9.2-proj4.patch 1185 SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f SHA512 15ac5f961217cd9067c1872d53f7399c4a4f93db5912c2c7e0de489922f83bc75c0720d6679474d003a5bf8617cccb85600f17f10c1ab80615a290c17893693a WHIRLPOOL 5c9b6bb3449513728a9071185e5194e561229a83010ffb35b483839322d42674621ebeabf47cc666c57aef21636b04032a8f97139df5abd3f9d3100d9f9330e1
-AUX 0.9.2-semaphore.patch 770 SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4 SHA512 6f921539e3dc09af453403f3b4137fc3e7d6fd4b81f05cb3214b4ab6a2feecbe2f3aeae1cdf03d92db13e60f7562825fa1a9bebfd75ac47fc6625b88f367b5ac WHIRLPOOL e1b8a55f0ce9d2626b53882528d0ee7056ad28ea5bbf746a7d77b4074d63977c1940bba478eb6b54a56d1b64e843a55106f53a21fb166d6566197828aef16208
-AUX 0.9.3-plwidth.patch 6795 SHA256 fe8e5c9e9d3aeaa424f775af099fda3fb2d7188a390eb053a26ec96a5e6a66de SHA512 3976743ce90397356134003bf07ddb8f7acb9269a5bbf0d75adae18e94eb5edceefa2a85b6c649d0a2c721a15be7a5b4dda7d6b7fdcb0deed63ef563d5a271af WHIRLPOOL cf093049b18453268bf26a78955f3238cc152577e089ec5a748a2cd0caece6a583f25314de8f6b31dfa3633a8539c6b4bd4df99f976da5fa0ea446ed5827068d
-AUX 0.9.4-gsl.patch 2263 SHA256 a3fe0744cfd6082d1fa7170a0df0a466024baa7bb8c2825d5ce7e988851641eb SHA512 6dd7cdd5d69cd3aa8948e0b1b40c95ddb5c8932f200a28653a08d9222e21a06158e3fab40f7a12d7c4d510f1b59db01ec851e7f89ec2fe6dde93c37e016b5468 WHIRLPOOL a15e13a9e53d49e6fe6c65d5d82e2fcc14be40a8354badf923a02f50fd1e24617d89f9bb26c2d9bf1488812ec5925477120b6fbc3c6c4716ff94b9d7d6311ce4
-AUX 0.9.4-plplot.patch 650 SHA256 48739e26ded982f020685a58ebac6d5f79e77eab19292ad6ccc8e798b059e832 SHA512 cba3aecd8bfef2bd044e1cd7aa9324ba0f8b25b3ec5994c2ba8af8f54c05ee1173199c73fbe9c117ba75e8a189bf56531aa8550371b256df1c4630840f82bb29 WHIRLPOOL a920cfb85497400f326d3f39f7cb354ab92d18cef8f101f3abb836bea545dfa66cdf6ac06f9921380daa30000d642cbc8621a32cdee50b1c8a73c0c7a4dad556
-AUX 0.9.4-python.patch 468 SHA256 2d5e4b886a848d739a0e88a3db4bc9046a34dff7ae61e6ddfcf7911d39cc7e4f SHA512 06da99316bfb77661fe2a6cbf7268c9c503a0684433d00375350bce5eef5f759a82006346fb37c80276acf4b358dd6cd348d30a622a6b0234c0a23247666ea4b WHIRLPOOL 6ba1f8df2082c6c40733b5228886d75f2df590339efc829048ca405124d048ad1ea218e6ed89c9ef53db28d4ef184772004272ef451480b3c0eedbef9df67c09
-AUX 0.9.4-python2.patch 448 SHA256 0460da490bd57fe54cbd318d8bc9e34efa7b6ef039985b380ee37400c4be256d SHA512 fb3089eda97cbad04b1a44c3e6b9c360b007d5c33953fe021d2b42c8609ce40db8cd19d3b83d55b82ce8d63fb86f547ca82eeb32a07f0fa2625a17a2f97a07c6 WHIRLPOOL 15996fba7aaac172900e1b49e211781f3751ba8f5e18321549213fbc10d6df8bea2bd8b5c8da29ea2bded5982edc21fd8d5f07f17d25eeaa25716baaaeb9529c
-AUX 0.9.4-reorder.patch 12680 SHA256 089680e37fcec56533d53953867a342e18cdb1d097a44603416bd3876c5f3c71 SHA512 ab3c41d808b91e1b1b854e0f96caf1e005f3ba229d6e3b34901505aef7d9df652611890e5646492e65d79bb377993c79e595ec3db2fb63bf6f8eca4d6013ba6b WHIRLPOOL 2b0ca937101d7a4f420d158d04cd9e0672b742b7a4d7becfda6f02bcf3f1f46b1ba5b13531b7808c772d8355e1519e0774d08978b29ff0640d2e87df60cb9663
 AUX 0.9.5-antlr.patch 3059 SHA256 ab44e0e5274c6e38fa1d37141b2c3426373ff97d3897e4e6f2cd0a191f0affe0 SHA512 2d8d47162fc0179319b728041421a72c965657023e396285de5ec2849b667e21117a587c771b88eb84c54f983747cb1635b7bfb0955762af1912efa88128593c WHIRLPOOL c0d183397164e37e038b97d7cd8f0a5096d120b2e5c0839afeac720d1e0516ea4a159f12cecf01ecd94a753c162aed5d590ef061341e121e1ec2e1ffdb46efcc
 AUX 0.9.5-plplot.patch 7611 SHA256 6f8495b145ff95f5d980c707f7b1e018ef1109f091d5f6230cdaff8810c7d45a SHA512 87211c6e23b1773982b8e3ccdd16cc1ae7cd12db9147efbc47b33403f05180d356ebe83b8c0c907ecea505455dee6059d57be6aa19c142aff56670a58f332625 WHIRLPOOL ad1326a01601cfc9fafcb356c714e30c8698de4ae1681381416f9f179b7e98e458c154de5b828fda5f48fe36b0fb44179f354f7433ec66dd9b1d12c7520d2ff1
 AUX 0.9.5-png.patch 489 SHA256 4c582ca1bcb7ec85d71d6f43f1c56f3d3635ef404f1ccab3e745a6cc7c77054d SHA512 6a7b09286fb62ad18b57434804260a6155c1f4739d72a9ed440c6efe1d682b126a297885d092fbf0cb1e2809a663cb9c7755507c807613199b317f981df7cfc1 WHIRLPOOL c47297b93144f16d7a5c11af1752d3634e2188a4043e1576c74154e6c38962c2169f574a5f16d2d2851ce479db4e591161ee77e8e0ea55c90853c2d216f46258
-AUX 0.9.5-proj4.patch 1421 SHA256 e0a52acf35420f58d42d65fc9f2fb85a6b203d8cd32063a05ad358f2207927ab SHA512 33bb23d83583c20ef4a89972171a73c64510505be8fa298c1ce4c7efdc64b8dc9b25ae24150a6b49665f0f256767d89d50df9936f01185220fe4fbe70aecea20 WHIRLPOOL c36db28a071d6bdbc882f4e65fd5c59408d5c1597fa8790ec75391c707bd850ab624fc5d35009945e282ec644415691fe849ce44f9c0a6babaa00b54c3c749ed
-DIST gdl-0.9.4.tar.gz 2191342 SHA256 e18010cd874cad7b1fd8c752e9386571156e1fb066f2d27ecbcc15bbfc9514fa SHA512 46921eb3333a6b890187a6c75f71758e5e234b76d61a194e17de81ace10760659a4a676060490a5ef7374fd1acadf47c7f565133c19ea165e04c54a577b3c723 WHIRLPOOL a760fcf37e47235e3d21c8c852b65560894e29cfe3684bfee6e83f2d1d060dcaa41a2f9e60e41cbae55d9e5a2036518a5aad22cfd6f07b951a978e1ba2446eae
 DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
-EBUILD gdl-0.9.4.ebuild 4104 SHA256 54764854c9e3765d0f9747b5b62d5382bed9653c7b04d4a5e3fb7845accc1ef5 SHA512 6c8ffc9af673c42258cea3fe564e42e6c2a6f269bb1e56737458a51b1dd3eda35a7d13dc10778e6c2fc676d41b1056e588ed0d7e1b5d4c3ba141ba2b1022f436 WHIRLPOOL 8d98f959950ed58ac9417297c4d73199a377a43d39d3ee3021f9520fc111d60bb40336842d1887207ead6a4ec00094f24e94d727b2fdac8dca3385720dbc007f
-EBUILD gdl-0.9.5.ebuild 3931 SHA256 8fccc3cbe8e472c5b2dcfbf759f6a8ed2b3d50211b23f2339383938ac41999fb SHA512 0c23566a420eddf53afd67139ae496b84383c7d5d471e6001773bab84e001d6abfa515a109aca9474301499a2e5c980ec02e4c6d383af10a5d4422aeaffe9f04 WHIRLPOOL 1bc815c0f302642bb57d445a12493015c0c444cfe70d467a8b171b460cc434b112c2f6cde0a27dee8f24d227e5ee01a8b51c2eeabbc815c539ea0866be5800f7
+EBUILD gdl-0.9.5-r1.ebuild 3944 SHA256 61d02de32231c5ce54cb39e87d86fca91b8d1988f791ea6219c2c255dfb5dd32 SHA512 5259f3e6ddf384fb45ede45a0a1f8ce591b3a15a0395a2d85e3c24d3d8a3a44325830ca5dbd1abfa4bd9d757edf5bda105a5e7d8b01f690e307c8921d3b3e1ff WHIRLPOOL 2b1b7aa568c63148b6577873aff831a590c19945df8519f78c5674f68111c6c217cd8f898076430babeadcbf2964e7d708bfd3f81041ab9e8b4d248d0662f14d
 MISC ChangeLog 10904 SHA256 0d69fc1c9e1bfccf5dd4404814cb0da35f3d1943e8b7fafb130376f4f55bf685 SHA512 60eaf82492a0e89b560271af0f6a7d7999fad9a96c0d8a2bd939219e3ae59ea1328abd44f0b8163964df37954a8907f854da70344d160a65f15032d2ffe95671 WHIRLPOOL f2c08f87d925f6661f5dedf75172b9c0a2bfd2623f8bb607de62ab085bff47e8386fd8e3f3f5e8d0072a1bb7c5f1448edf9a9c9c0f5dca772c08599f8a25804c
 MISC metadata.xml 1040 SHA256 69ed763ac20a6a9402eeb9f0cd693c3974df7923eaf27bb3ed60e8a452e99e29 SHA512 f9069d3156d3f9583b37d209430b8d65c1077c5781fa1ea551a0787a03c7d2e962c6def67492dfff6a757d4386a98f5bcce9ab96e5b9c7425a069850406a438b WHIRLPOOL 4e136fdcce7c17f0c4c2cccf9f2d2208dc454a207f8ef2d4b0916b9f069378b975d5eb14f22463b98b7779353c10198453d12ccaffd2097df2210185674c2c51
--- a/dev-lang/gdl/files/0.9.2-antlr.patch
+++ b/dev-lang/gdl/files/0.9.2-antlr.patch
@ -1,76 +0,0 @@
-diff -Nur gdl-0.9.2.orig/CMakeLists.txt gdl-0.9.2/CMakeLists.txt
--- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt	2011-12-22 20:32:20.000000000 +0000
-@@ -94,6 +94,8 @@
- 
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "Choose data install directory relative to CMAKE_INSTALL_PREFIX")
- 
-+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
-+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
- 
- # check for 64-bit OS
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-@@ -143,9 +145,15 @@
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
- 
-# SA: whithout it compilation of antlr fails if there's a conflicting 
-#     version of antlr in system-wide directories
-include_directories(src)
-+if(BUNDLED_ANTLR)
-+  # SA: whithout it compilation of antlr fails if there's a conflicting 
-+  #     version of antlr in system-wide directories
-+  include_directories(src)
-+else(BUNDLED_ANTLR)
-+  find_package(ANTLR QUIET)
-+  set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
-+  include_directories(${ANTLR_INCLUDE_DIR})
-+endif(BUNDLED_ANTLR)
- 
- # Ncurses MANDATORY
- # -DNCURSESDIR=DIR
-diff -Nur gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake gdl-0.9.2/CMakeModules/FindANTLR.cmake
--- gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ gdl-0.9.2/CMakeModules/FindANTLR.cmake	2011-12-22 21:03:34.000000000 +0000
-@@ -0,0 +1,11 @@
-+
-+
-+find_library(ANTLR_LIBRARIES NAMES antlr)
-+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+ANTLR_LIBRARIES
-+ANTLR_INCLUDE_DIR
-+)
-diff -Nur gdl-0.9.2.orig/src/CMakeLists.txt gdl-0.9.2/src/CMakeLists.txt
--- gdl-0.9.2.orig/src/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/src/CMakeLists.txt	2011-12-22 20:31:27.000000000 +0000
-@@ -224,9 +224,8 @@
- widget.cpp
- )
- 
-add_subdirectory(antlr)
- 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
- 
- if(PYTHON_MODULE) #libgdl
-@@ -237,8 +236,13 @@
- 	add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
- 
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-target_link_libraries(gdl antlr) # link antlr against gdl
-+if(BUNDLED_ANTLR)
-+  add_subdirectory(antlr)
-+  include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
-+  add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-+  target_link_libraries(gdl antlr) # link antlr against gdl
-+endif(BUNDLED_ANTLR)
-+
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
- 
--- a/dev-lang/gdl/files/0.9.2-proj4.patch
+++ b/dev-lang/gdl/files/0.9.2-proj4.patch
@ -1,27 +0,0 @@
--- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt	2011-12-24 06:12:08.000000000 +0000
-@@ -412,17 +420,17 @@
- 	find_package(Libproj4 QUIET)
- 	if(LIBPROJ4_FOUND)	
- 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
-		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
-		if(USE_LIBPROJ4_NEW)
-+		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
-+		if(USE_LIBPROJ4)
- 			set(USE_LIBPROJ4 1)
-		else(USE_LIBPROJ4_NEW)
-			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
-			if(NOT USE_LIBPROJ4)
-+		else(USE_LIBPROJ4)
-+			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
-+			if(NOT USE_LIBPROJ4_NEW)
- 				message(FATAL_ERROR "Libproj4 is required but was not found.\n"
- 				"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- 				"Use -DLIBPRJ4=OFF to not use it.")
-			endif(NOT USE_LIBPROJ4)
-		endif(USE_LIBPROJ4_NEW)
-+			endif(NOT USE_LIBPROJ4_NEW)
-+		endif(USE_LIBPROJ4)
- 		include_directories(${LIBPROJ4_INCLUDE_DIR})
- 		set(LIBRARIES ${LIBRARIES} ${LIBPROJ4_LIBRARIES})
- 		set(CMAKE_REQUIRED_LIBRARIES)
--- a/dev-lang/gdl/files/0.9.2-semaphore.patch
+++ b/dev-lang/gdl/files/0.9.2-semaphore.patch
@ -1,22 +0,0 @@
--- gdl-0.9.2/CMakeLists.txt	2011-11-06 22:39:45.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt.new	2012-06-21 00:02:42.000000000 +0100
-@@ -217,6 +217,19 @@
- 		add_definitions(${OpenMP_CXX_FLAGS})
- 		set(LIBRARIES ${LIBRARIES} ${OpenMP_CXX_FLAGS})
- 	endif(OPENMP_FOUND)
-+else(OPENMP)
-+  # we need to define those semaphore posix symbols, do it with threads libs
-+  find_package(Threads)
-+  if(THREADS_FOUND)
-+    set(LIBRARIES ${LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-+  else(THREADS_FOUND)
-+    check_library_exists(rt sem_unlink "" HAVE_RT)
-+    if(HAVE_RT)
-+      set(LIBRARIES ${LIBRARIES} rt)
-+    else(HAVE_RT)
-+	message(FATAL_ERROR "Missing a POSIX semaphore symbols (rt or threads).\n")
-+    endif(HAVE_RT)
-+  endif(THREADS_FOUND)
- endif(OPENMP)
- 
- # GSL MANDATORY
--- a/dev-lang/gdl/files/0.9.3-plwidth.patch
+++ b/dev-lang/gdl/files/0.9.3-plwidth.patch
@ -1,158 +0,0 @@
-diff -up gdl-0.9.3/CMakeLists.txt.plwidth gdl-0.9.3/CMakeLists.txt
--- gdl-0.9.3/CMakeLists.txt.plwidth	2013-08-27 16:55:33.806600443 -0600
-+++ gdl-0.9.3/CMakeLists.txt	2013-08-27 16:55:36.589590528 -0600
-@@ -23,6 +23,7 @@ include(CheckLibraryExists)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
- include(CheckCSourceRuns)
-+include(CheckCXXSourceCompiles)
- include(FindPkgConfig)
- include(FindPackageHandleStandardArgs)
- 
-@@ -302,6 +303,18 @@ if(PLPLOT_FOUND)
- 	  message(STATUS "warning, due to old plplot library, [XYZ]TICKFORMAT option for plot axis will not be supported.\n"
- 	    "you should upgrade to plplot version > 5.9.6")
- 	endif(HAVE_PLPLOT_SLABELFUNC)
-+	set(CMAKE_REQUIRED_INCLUDES "${PLPLOT_INCLUDE_DIR}")
-+	set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
-+	check_cxx_source_compiles("
-+#include <plplot/plstream.h>
-+int main(int argc, char **argv) {
-+  plstream *p = new plstream();
-+  PLFLT w = 0.5;
-+  p->width(w);
-+}" HAVE_PLPLOT_WIDTH)
-+	if(HAVE_PLPLOT_WIDTH)
-+	  set(HAVE_PLPLOT_WIDTH 1)
-+	endif(HAVE_PLPLOT_WIDTH)
- 	check_library_exists("${PLPLOT_LIBRARIES}" plstrl "" PLPLOT_PRIVATE_NOT_HIDDEN)
- 	if(PLPLOT_PRIVATE_NOT_HIDDEN)
- 	  set(PLPLOT_PRIVATE_NOT_HIDDEN 1)
-diff -up gdl-0.9.3/config.h.cmake.plwidth gdl-0.9.3/config.h.cmake
--- gdl-0.9.3/config.h.cmake.plwidth	2013-08-27 16:55:33.808600436 -0600
-+++ gdl-0.9.3/config.h.cmake	2013-08-27 16:55:36.589590528 -0600
-@@ -28,6 +28,7 @@
- #cmakedefine HAVE_NEXTTOWARD 1
- #cmakedefine HAVE_OLDPLPLOT 1
- #cmakedefine HAVE_PLPLOT_SLABELFUNC 1
-+#cmakedefine HAVE_PLPLOT_WIDTH 1
- #cmakedefine PLPLOT_PRIVATE_NOT_HIDDEN 1
- #cmakedefine PLPLOT_HAS_LEGEND
- #ifndef HAVE_STDINT_H
-diff -up gdl-0.9.3/src/plotting_contour.cpp.plwidth gdl-0.9.3/src/plotting_contour.cpp
--- gdl-0.9.3/src/plotting_contour.cpp.plwidth	2013-08-27 16:55:33.883600169 -0600
-+++ gdl-0.9.3/src/plotting_contour.cpp	2013-08-27 16:55:36.590590524 -0600
-@@ -705,7 +705,11 @@ namespace lib
-               actStream->pat(1,&ori,&spa);
- 
-               if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, (PLINT)colorindex_table_0_color );
-+#if (HAVE_PLPLOT_WIDTH)
-+              if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
-               if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
-               if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
-               actStream->shade( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd,
-               clevel[i], clevel[i+1],
-@@ -788,7 +792,11 @@ namespace lib
-               actStream->stransform(gdl3dTo2dTransformContour, &Data3d);
-             }
-             if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+            if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
-             if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
-             if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
-             if (dolabels) actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING,
-                                                         (PLINT)(*labels)[i%labels->N_Elements()] );
-diff -up gdl-0.9.3/src/plotting.cpp.plwidth gdl-0.9.3/src/plotting.cpp
--- gdl-0.9.3/src/plotting.cpp.plwidth	2013-08-27 16:55:33.886600158 -0600
-+++ gdl-0.9.3/src/plotting.cpp	2013-08-27 16:58:33.707952697 -0600
-@@ -1891,7 +1891,11 @@ namespace lib
-       DFloatGDL* charthickVect=e->GetKWAs<DFloatGDL>( charthickIx );
-       charthick=(*charthickVect)[0];
-     }
-+#if (HAVE_PLPLOT_WIDTH)
-+    a->width(static_cast<PLFLT>(charthick));
-+#else
-     a->wid(charthick);
-+#endif
-   }
- 
-   void gdlSetAxisCharsize(EnvT *e, GDLGStream *a, string axis)
-@@ -1919,7 +1923,11 @@ namespace lib
- 
-     e->AssureFloatScalarKWIfPresent("THICK", thick);
-     if ( thick<=0.0 ) thick=1.0;
-+#if (HAVE_PLPLOT_WIDTH)
-+    a->width(static_cast<PLFLT>(thick));
-+#else
-     a->wid(static_cast<PLINT>(floor(thick-0.5)));
-+#endif
-   }
- 
-   //LINESTYLE
-@@ -2932,7 +2940,11 @@ namespace lib
-         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
-         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
-         //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+        a->width(static_cast<PLFLT>(Thick));
-+#else
-         a->wid(Thick);
-+#endif
-         //ticks or grid eventually with style and length:
-         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
-         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -2977,7 +2989,11 @@ namespace lib
-         else if (axis=="Y") a->box("", 0.0, 0 , Opt.c_str(), 0.0, 0);
-       }
-       //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+      a->width(1.0);
-+#else
-       a->wid(1);
-+#endif
-       a->sizeChar(1.0);
-     }
- 	return 0;
-@@ -3120,7 +3136,11 @@ namespace lib
-         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
-         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
-         //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+        a->width(static_cast<PLFLT>(Thick));
-+#else
-         a->wid(Thick);
-+#endif
-         //ticks or grid eventually with style and length:
-         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
-         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -3145,7 +3165,11 @@ namespace lib
-         else if (axis=="Z") a->box3("","",0,0,"","",0,0, Opt.c_str(), "", TickInterval, Minor);
-       }
-       //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+      a->width(1.0);
-+#else
-       a->wid(1);
-+#endif
-       a->sizeChar(1.0);
-     }
- 	return 0;
-diff -up gdl-0.9.3/src/plotting_xyouts.cpp.plwidth gdl-0.9.3/src/plotting_xyouts.cpp
--- gdl-0.9.3/src/plotting_xyouts.cpp.plwidth	2013-08-27 16:55:33.892600137 -0600
-+++ gdl-0.9.3/src/plotting_xyouts.cpp	2013-08-27 16:55:36.591590521 -0600
-@@ -339,7 +339,11 @@ namespace lib
-         //plot!
-         if (docharsize) actStream->sizeChar(( *size )[i%size->N_Elements ( )]);
-         if (docolor) actStream->Color ( ( *color )[i%color->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+        if (docharthick) actStream->width ( static_cast<PLFLT>(( *charthick )[i%charthick->N_Elements ( )]));
-+#else
-         if (docharthick) actStream->wid ( ( *charthick )[i%charthick->N_Elements ( )]);
-+#endif
-         //orientation word is not orientation page depending on axes increment direction [0..1] vs. [1..0]
-         PLFLT oriD=(( *orientation )[i%orientation->N_Elements ( )]); //ori DEVICE
-         PLFLT oriW=oriD; //ori WORLD
--- a/dev-lang/gdl/files/0.9.4-gsl.patch
+++ b/dev-lang/gdl/files/0.9.4-gsl.patch
@ -1,62 +0,0 @@
-diff -up gdl-0.9.4/src/gsl_matrix.cpp.gsl gdl-0.9.4/src/gsl_matrix.cpp
--- gdl-0.9.4/src/gsl_matrix.cpp.gsl	2013-09-20 10:10:02.000000000 -0600
-+++ gdl-0.9.4/src/gsl_matrix.cpp	2013-10-03 13:50:41.089660703 -0600
-@@ -41,10 +41,11 @@ namespace lib {
-   const int szdbl=sizeof(DDouble);
-   const int szflt=sizeof(DFloat);
-   const int szlng=sizeof(DLong);
-+  const int szlng64=sizeof(DLong64);
- 
-   void ludc_pro( EnvT* e)
-   {
-    //  cout << szdbl << " " <<szflt << " " << szlng << endl;
-+    //  cout << szdbl << " " <<szflt << " " << szlng << " " szlng64 << endl;
- 
-     SizeT nParam=e->NParam(1);
-     //     if( nParam == 0)
-@@ -120,9 +121,15 @@ namespace lib {
-     dimension dim1(&n, (SizeT) 1);
-     BaseGDL** p1D = &e->GetPar( 1);
-     GDLDelete((*p1D));
-    *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
-    memcpy(&(*(DLongGDL*) *p1D)[0], p->data, 
-	   p0->Dim(0)*szlng);
-+    if (sizeof(size_t) == szlng) {
-+      *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
-+      memcpy(&(*(DLongGDL*) *p1D)[0], p->data, 
-+	p0->Dim(0)*szlng);
-+    } else {
-+      *p1D = new DLong64GDL(dim1, BaseGDL::NOZERO);
-+      memcpy(&(*(DLong64GDL*) *p1D)[0], p->data, 
-+	p0->Dim(0)*szlng64);
-+    }
-     
- //     gsl_matrix_free(mat);
- //     gsl_permutation_free(p);
-@@ -189,10 +196,15 @@ namespace lib {
-     GDLGuard<gsl_matrix> g1(mat,gsl_matrix_free);
-     memcpy(mat->data, &(*p0D)[0], nEl*szdbl);
- 
-    DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
-     gsl_permutation *p = gsl_permutation_alloc (nEl1);
-     GDLGuard<gsl_permutation> g2(p,gsl_permutation_free);
-    memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+    if (sizeof(size_t) == szlng) {
-+      DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
-+      memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+    } else {
-+      DLong64GDL* p1L =e->GetParAs<DLong64GDL>(1);
-+      memcpy(p->data, &(*p1L)[0], nEl1*szlng64);
-+    }
-       
-     DDoubleGDL *p2D = e->GetParAs<DDoubleGDL>(2);
-     gsl_vector *b = gsl_vector_alloc(nEl2);
-@@ -222,7 +234,7 @@ namespace lib {
-     DDoubleGDL* res = new DDoubleGDL( p2->Dim(), BaseGDL::NOZERO);
-     memcpy(&(*res)[0], x->data, nEl1*szdbl);
- 	
-//     gsl_matrix_free(mat);
-+//     gsl_matrix_free(mat);Parameter
- //     gsl_vector_free(x);
- //     gsl_permutation_free(p);
- //     b ???    
--- a/dev-lang/gdl/files/0.9.4-plplot.patch
+++ b/dev-lang/gdl/files/0.9.4-plplot.patch
@ -1,18 +0,0 @@
- CMakeModules/FindPlplot.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
-index a503f8c..cdaeb24 100644
--- a/CMakeModules/FindPlplot.cmake
-+++ b/CMakeModules/FindPlplot.cmake
-@@ -9,8 +9,8 @@
- #
- 
- 
-find_library(PLPLOT_LIBRARY NAMES plplotd)
-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
-+find_library(PLPLOT_LIBRARY NAMES plplotd plplot)
-+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd plplotcxx)
- set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
- find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
- include(FindPackageHandleStandardArgs)
--- a/dev-lang/gdl/files/0.9.4-python.patch
+++ b/dev-lang/gdl/files/0.9.4-python.patch
@ -1,12 +0,0 @@
-diff -up gdl-0.9.4/src/pythongdl.cpp.python gdl-0.9.4/src/pythongdl.cpp
--- gdl-0.9.4/src/pythongdl.cpp.python	2013-07-26 03:30:32.000000000 -0600
-+++ gdl-0.9.4/src/pythongdl.cpp	2013-09-30 10:24:27.092666180 -0600
-@@ -373,7 +373,7 @@ PyObject *GDLSub( PyObject *self, PyObje
-     if( libCall)
-       e = new EnvT( NULL, sub);
-     else
-      e = new EnvUDT( NULL, sub);
-+      e = new EnvUDT( NULL, static_cast<DSubUD*>(sub));
- 
-     Guard< EnvBaseT> e_guard( e);
- 
--- a/dev-lang/gdl/files/0.9.4-python2.patch
+++ b/dev-lang/gdl/files/0.9.4-python2.patch
@ -1,17 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fda8ee..e2170b2 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -615,8 +615,8 @@ if(PYTHON OR PYTHON_MODULE)
- 		else()
- 			set(PythonLibs_FIND_VERSION 2)
- 		endif()
-		find_package(PythonLibs)
- 		include(FindPythonInterp)
-+		find_package(PythonLibs)
- 	endif()
- 	set(USE_PYTHON ${PYTHONLIBS_FOUND})
- 	if(PYTHONLIBS_FOUND)
--- a/dev-lang/gdl/files/0.9.4-reorder.patch
+++ b/dev-lang/gdl/files/0.9.4-reorder.patch
@ -1,380 +0,0 @@
-diff -up gdl-0.9.4/src/allix.hpp.reorder gdl-0.9.4/src/allix.hpp
--- gdl-0.9.4/src/allix.hpp.reorder	2012-12-11 10:39:35.000000000 -0700
-+++ gdl-0.9.4/src/allix.hpp	2013-10-04 10:59:22.666594845 -0600
-@@ -344,9 +344,9 @@ private:
- public:
-   AllIxAllIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_)
-     : ixList( ixList_)
-+    , varStride( varStride_)
-     , acRank( acRank_)
-     , nIx( nIx_)
-    , varStride( varStride_)
-   {}
-   ~AllIxAllIndexedT() {}
- 
-@@ -384,11 +384,11 @@ private:
- public:
-   AllIxNewMultiT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
-    , acRank( acRank_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-   {
-     add = 0;
- 	assert( varStride[0] == 1);
-@@ -440,10 +440,10 @@ private:
- public:
-   AllIxNewMulti2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , nIx( nIx_)
-   {
-     add = 0;
- 	if( !(*ixList)[0]->Indexed())
-@@ -499,11 +499,11 @@ private:
- public:
-   AllIxNewMultiNoneIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
-    , acRank( acRank_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-   {
- 	assert( varStride[0] == 1);
-     add = 0;
-@@ -548,10 +548,10 @@ private:
- public:
-   AllIxNewMultiNoneIndexed2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , nIx( nIx_)
-   {
- 		assert( varStride[0] == 1);
- 		ixListStride[0] = (*ixList)[0]->GetStride();
-@@ -593,11 +593,11 @@ public:
-   AllIxNewMultiOneVariableIndexNoIndexT( RankT gt1Rank, SizeT add_,
- 								  ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- 	: ixList( ixList_)
-    , acRank( acRank_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
- 	, add( add_)
- 	, variableIndex( gt1Rank)
- 	{
-@@ -642,11 +642,11 @@ public:
- 					 SizeT acRank_, SizeT nIx_, const SizeT* varStride_, 
- 					 SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
-    , acRank( acRank_)
-    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-     , add( add_)
-     , variableIndex( gt1Rank)
-     {
-diff -up gdl-0.9.4/src/arrayindex.hpp.reorder gdl-0.9.4/src/arrayindex.hpp
--- gdl-0.9.4/src/arrayindex.hpp.reorder	2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindex.hpp	2013-10-04 11:00:58.849879562 -0600
-@@ -303,7 +303,7 @@ private:
-   RangeT s;
-   BaseGDL* rawData; // for overloaded object indexing
- 
-  CArrayIndexScalar( const CArrayIndexScalar& c): s( c.s), sInit( c.sInit) 
-+  CArrayIndexScalar( const CArrayIndexScalar& c):  sInit( c.sInit), s( c.s)
-   {
-     assert( c.rawData != NULL);
-     rawData = c.rawData->Dup();
-diff -up gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder gdl-0.9.4/src/arrayindexlistnoassoct.hpp
--- gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder	2013-07-04 17:24:44.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistnoassoct.hpp	2013-10-04 11:24:02.893867004 -0600
-@@ -59,8 +59,8 @@ public:
-   { nParam = 0;}
- 
-   ArrayIndexListOneNoAssocT( const ArrayIndexListOneNoAssocT& cp):
-	cleanupIx(),
-     ArrayIndexListT( cp),
-+	cleanupIx(),
-     ix( cp.ix->Dup()),
-     allIx( NULL)
-   {
-diff -up gdl-0.9.4/src/arrayindexlistt.hpp.reorder gdl-0.9.4/src/arrayindexlistt.hpp
--- gdl-0.9.4/src/arrayindexlistt.hpp.reorder	2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistt.hpp	2013-10-04 11:23:35.607069888 -0600
-@@ -130,8 +130,8 @@ public:
-   { nParam = 0;}
- 
-   ArrayIndexListOneT( const ArrayIndexListOneT& cp):
-	cleanupIx(),
-     ArrayIndexListT( cp),
-+	cleanupIx(),
-     ix( cp.ix->Dup()),
-     allIx( NULL)
-   {
-diff -up gdl-0.9.4/src/deviceps.hpp.reorder gdl-0.9.4/src/deviceps.hpp
--- gdl-0.9.4/src/deviceps.hpp.reorder	2013-07-03 15:48:06.000000000 -0600
-+++ gdl-0.9.4/src/deviceps.hpp	2013-10-04 13:14:48.283746779 -0600
-@@ -441,9 +441,9 @@ private:
-   }
- 
- public:
-  DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL), color(0), 
-    decomposed( 0), encapsulated(false), scale(1.), XPageSize(17.78), YPageSize(12.7),
-    XOffset(0.0),YOffset(0.0)
-+  DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL),
-+    XPageSize(17.78), YPageSize(12.7), XOffset(0.0),YOffset(0.0),
-+    color(0), decomposed( 0), encapsulated(false), scale(1.)
-   {
-     name = "PS";
- 
-diff -up gdl-0.9.4/src/dnode.cpp.reorder gdl-0.9.4/src/dnode.cpp
--- gdl-0.9.4/src/dnode.cpp.reorder	2012-09-18 08:19:18.000000000 -0600
-+++ gdl-0.9.4/src/dnode.cpp	2013-10-04 12:02:48.601416601 -0600
-@@ -55,9 +55,10 @@ DNode::DNode( const DNode& cp):
- //   keepRight( false),
-   CommonAST( cp), //down(), right(), 
-   lineNumber( cp.getLine()), cData(NULL), 
-  var(cp.var), arrIxList(NULL),arrIxListNoAssoc(NULL), 
-+  var(cp.var),
-   libFun( cp.libFun),
-   libPro( cp.libPro),
-+  arrIxList(NULL),arrIxListNoAssoc(NULL), 
-   labelStart( cp.labelStart), labelEnd( cp.labelEnd)
- {
-   if( cp.cData != NULL) cData = cp.cData->Dup();
-diff -up gdl-0.9.4/src/dnode.hpp.reorder gdl-0.9.4/src/dnode.hpp
-diff -up gdl-0.9.4/src/dpro.cpp.reorder gdl-0.9.4/src/dpro.cpp
--- gdl-0.9.4/src/dpro.cpp.reorder	2013-09-17 03:03:25.000000000 -0600
-+++ gdl-0.9.4/src/dpro.cpp	2013-10-04 13:05:23.169223727 -0600
-@@ -200,8 +200,8 @@ DSubUD::~DSubUD()
- DSubUD::DSubUD(const string& n,const string& o,const string& f) : 
-   DSub(n,o), file(f),
-   tree( NULL),
-  labelList(),
-   compileOpt(GDLParser::NONE),
-+  labelList(),
-   nForLoops( 0)
- {
-   if( o != "")
-diff -up gdl-0.9.4/src/envt.cpp.reorder gdl-0.9.4/src/envt.cpp
--- gdl-0.9.4/src/envt.cpp.reorder	2013-09-25 05:55:21.000000000 -0600
-+++ gdl-0.9.4/src/envt.cpp	2013-10-04 13:08:17.081114086 -0600
-@@ -107,15 +107,15 @@ void EnvUDT::operator delete( void *ptr)
- 
- 
- EnvBaseT::EnvBaseT( ProgNodeP cN, DSub* pro_): 
-  env(), 
-   toDestroy(),
-+  env(), 
-   pro(pro_),
-  extra(NULL),
-  newEnv(NULL), 
-   callingNode( cN),
-   lineNumber( 0),
-  obj(false)
-  ,ptrToReturnValue(NULL)
-+  obj(false),
-+  extra(NULL),
-+  newEnv(NULL), 
-+  ptrToReturnValue(NULL)
- //, toDestroyInitialIndex( toDestroy.size())
- {}
- 
-diff -up gdl-0.9.4/src/envt.hpp.reorder gdl-0.9.4/src/envt.hpp
--- gdl-0.9.4/src/envt.hpp.reorder	2013-09-26 04:47:48.000000000 -0600
-+++ gdl-0.9.4/src/envt.hpp	2013-10-04 10:55:21.892428311 -0600
-@@ -863,7 +863,7 @@ public:
-   typedef SizeT size_type;
-   typedef EnvUDT* pointer_type;
-   
-  EnvStackT(): sz(defaultStackDepth), top(0) 
-+  EnvStackT(): top(0), sz(defaultStackDepth) 
-   {
-     envStackFrame = new EnvUDT* [ sz+1];
-     envStack = envStackFrame + 1;
-diff -up gdl-0.9.4/src/gdlexception.cpp.reorder gdl-0.9.4/src/gdlexception.cpp
--- gdl-0.9.4/src/gdlexception.cpp.reorder	2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.cpp	2013-10-04 14:00:32.102348401 -0600
-@@ -43,9 +43,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( 0), col( 0), prefix( pre),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(decorate && interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -97,9 +97,9 @@ GDLException::GDLException(const RefDNod
-   errorNodeP( NULL),
-   errorCode(-1),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -122,9 +122,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -148,9 +148,9 @@ GDLException::GDLException(const ProgNod
-   errorNodeP( eN),
-   errorCode(-1),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -177,9 +177,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( eN),
-   errorCode(eC),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
-   if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-@@ -207,9 +207,9 @@ GDLException::GDLException(SizeT l, Size
-   errorNodeP( NULL),
-   errorCode(-1),
-   line( l), col( c), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
-   if(interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-@@ -232,8 +232,8 @@ GDLException::GDLException(DLong eC, Siz
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( l), col( c), prefix( true),
-  targetEnv( NULL),
-  arrayexprIndexeeFailed(false)
-+  arrayexprIndexeeFailed(false),
-+  targetEnv( NULL)
- {
-   if(interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-diff -up gdl-0.9.4/src/gdlexception.hpp.reorder gdl-0.9.4/src/gdlexception.hpp
--- gdl-0.9.4/src/gdlexception.hpp.reorder	2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.hpp	2013-10-04 11:12:58.332125288 -0600
-@@ -66,18 +66,18 @@ public:
- 		  errorNodeP( NULL),
- 		  errorCode(-1),
- 		  line( 0), col( 0), prefix( true),
-+		  arrayexprIndexeeFailed(false),
- 		  ioException( false),
-		  targetEnv( NULL),
-		  arrayexprIndexeeFailed(false)
-+		  targetEnv( NULL)
-   {}
-   GDLException( DLong eC): ANTLRException(), 
-     errorNode(static_cast<RefDNode>(antlr::nullAST)),
- 		  errorNodeP( NULL),
- 		  errorCode(eC),
- 		  line( 0), col( 0), prefix( true),
-+		  arrayexprIndexeeFailed(false),
- 		  ioException( false),
-		  targetEnv( NULL),
-		  arrayexprIndexeeFailed(false)
-+		  targetEnv( NULL)
-   {}
-   GDLException(const std::string& s, bool pre = true, bool decorate=true);
-   GDLException(const RefDNode eN, const std::string& s);
-diff -up gdl-0.9.4/src/prognode.cpp.reorder gdl-0.9.4/src/prognode.cpp
--- gdl-0.9.4/src/prognode.cpp.reorder	2013-09-27 18:47:49.000000000 -0600
-+++ gdl-0.9.4/src/prognode.cpp	2013-10-04 14:01:11.490342867 -0600
-@@ -54,19 +54,19 @@ return nonCopyNodeLookupArray;
- 
- // tanslation RefDNode -> ProgNode
- ProgNode::ProgNode( const RefDNode& refNode):
-+  ttype( refNode->getType()),
-+  text( refNode->getText()),
- 	keepRight( false),
- 	keepDown( false),
- 	breakTarget( NULL),
-  ttype( refNode->getType()),
-  text( refNode->getText()),
-   down( NULL), 
-   right( NULL),
-  lineNumber( refNode->getLine()),
-   cData( refNode->StealCData()), // stealing is crucial here because references might exist
-+  var( refNode->var),
-   // as arrayindices
-  libPro( refNode->libPro),
-   libFun( refNode->libFun),
-  var( refNode->var),
-+  libPro( refNode->libPro),
-+  lineNumber( refNode->getLine()),
-   arrIxList( refNode->StealArrIxList()),
-   arrIxListNoAssoc( refNode->StealArrIxNoAssocList()),
- //   arrIxList( refNode->CloneArrIxList()),
-diff -up gdl-0.9.4/src/prognodeexpr.cpp.reorder gdl-0.9.4/src/prognodeexpr.cpp
--- gdl-0.9.4/src/prognodeexpr.cpp.reorder	2013-09-26 05:08:39.000000000 -0600
-+++ gdl-0.9.4/src/prognodeexpr.cpp	2013-10-04 13:20:36.660155916 -0600
-@@ -49,18 +49,18 @@ BinaryExprNC::BinaryExprNC( const RefDNo
- }
- 
- ProgNode::ProgNode(): // for NULLProgNode
-+  ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
-+  text( "NULLProgNode"),
- 	keepRight( false),
- 	keepDown( false),
- 	breakTarget( NULL),
-  ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
-  text( "NULLProgNode"),
-   down( NULL), 
-   right( NULL),
-  lineNumber( 0),
-   cData( NULL),
-  libPro( NULL),
-  libFun( NULL),
-   var( NULL),
-+  libFun( NULL),
-+  libPro( NULL),
-+  lineNumber( 0),
-   labelStart( 0),
-   labelEnd( 0)
- {}
--- a/dev-lang/gdl/files/0.9.5-proj4.patch
+++ b/dev-lang/gdl/files/0.9.5-proj4.patch
@ -1,41 +0,0 @@
- CMakeLists.txt | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c4b3278..f9ed49d 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -637,17 +637,17 @@ if(LIBPROJ4)
- 	if(LIBPROJ4_FOUND)	
- 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
- 
-		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
-		if(USE_LIBPROJ4_NEW)
-+		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
-+		if(USE_LIBPROJ4)
- #		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
- #		if(USE_LIBPROJ4)
- 
-                         # define USE_LIB_PROJ4 in any case
- 			set(USE_LIBPROJ4 1)
- 
-		else(USE_LIBPROJ4_NEW)
-			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
-			if(NOT USE_LIBPROJ4)
-+		else(USE_LIBPROJ4)
-+			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
-+			if(NOT USE_LIBPROJ4_NEW)
- #		else(USE_LIBPROJ4)
- #			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
- #			if(NOT USE_LIBPROJ4_NEW)
-@@ -656,8 +656,8 @@ if(LIBPROJ4)
- 				"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- 				"Use -DLIBPRJ4=OFF to not use it.")
- 
-			endif(NOT USE_LIBPROJ4)
-		endif(USE_LIBPROJ4_NEW)
-+			endif(NOT USE_LIBPROJ4_NEW)
-+		endif(USE_LIBPROJ4)
- #			endif(NOT USE_LIBPROJ4_NEW)
- #		endif(USE_LIBPROJ4)
- 
--- a/dev-lang/gdl/gdl-0.9.4.ebuild
+++ b/dev-lang/gdl/gdl-0.9.4.ebuild
@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
-	proj postscript	python static-libs udunits wxwidgets"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	sci-libs/plplot:0=[-dynamic]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libX11:0=
-	fftw? ( sci-libs/fftw:3.0= )
-	grib? ( sci-libs/grib_api:0= )
-	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
-	hdf? ( sci-libs/hdf:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		|| (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx]
-			)
-	)
-	netcdf? ( sci-libs/netcdf )
-	proj? ( sci-libs/proj )
-	postscript? ( dev-libs/pslib )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-
-DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.2-antlr.patch
-	"${FILESDIR}"/0.9.2-include.patch
-	"${FILESDIR}"/0.9.2-proj4.patch
-	"${FILESDIR}"/0.9.2-semaphore.patch
-	"${FILESDIR}"/0.9.3-plwidth.patch
-	"${FILESDIR}"/0.9.4-gsl.patch
-	"${FILESDIR}"/0.9.4-python.patch
-	"${FILESDIR}"/0.9.4-reorder.patch
-	"${FILESDIR}"/0.9.4-plplot.patch
-	"${FILESDIR}"/0.9.4-python2.patch
-)
-
-pkg_setup() {
-	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
-		die "You have openmp enabled but your current g++ does not support it"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	# make sure antlr includes are from system and rebuild the sources with it
-	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
-	rm -r src/antlr || die
-	einfo "Regenerating grammar"
-	pushd src > /dev/null
-	local i
-	for i in *.g; do antlr ${i} || die ; done
-	popd > /dev/null
-
-	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
-	sed -i \
-		-e 's:proj4:proj:' \
-		-e 's:lib_proj\.h:proj_api\.h:g' \
-		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
-	# gentoo: avoid install files in datadir directory
-	sed -i \
-		-e '/AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# MPI is still very buggy
-	# x11=off does not compile
-	local mycmakeargs=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DX11=ON
-		$(cmake-utils_use fftw)
-		$(cmake-utils_use eigen EIGEN3)
-		$(cmake-utils_use grib)
-		$(cmake-utils_use gshhs)
-		$(cmake-utils_use hdf)
-		$(cmake-utils_use hdf5)
-		$(cmake-utils_use netcdf)
-		$(cmake-utils_use openmp)
-		$(cmake-utils_use proj LIBPROJ4)
-		$(cmake-utils_use postscript PSLIB)
-		$(cmake-utils_use udunits)
-		$(cmake-utils_use wxwidgets)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
-		else
-			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
-		fi
-	else
-		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
-	fi
-	configuration() {
-		mycmakeargs+=( $@ )
-		cmake-utils_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		installation() {
-			mv src/libgdl.so GDL.so || die
-			python_domodule GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-
-	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
-	doenvd 50gdl
-}
--- a/dev-lang/gdl/gdl-0.9.5-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
@ -20,6 +20,7 @@ IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
 	png proj postscript	python static-libs udunits wxwidgets"

 RDEPEND="
+	dev-cpp/antlr-cpp:2=
 	sci-libs/gsl:0=
 	sci-libs/plplot:0=[-dynamic]
 	sys-libs/ncurses:0=
@ -48,7 +49,7 @@ RDEPEND="
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"

 DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
+	dev-java/antlr:0[java(+),script(+)]
 	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )"

--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@ -16,6 +16,6 @@ EBUILD swi-prolog-7.2.3-r1.ebuild 3107 SHA256 cbf775b32bd39f60ba5418ecabd58cceeb
 EBUILD swi-prolog-7.2.3.ebuild 2983 SHA256 581a734aa35f52935bc27a742ef7de58d7cf7b5a370dfbb91d4fa1229d132743 SHA512 98b378fea8d773fcfdafc13305c3c85811a17a3d7f7dcb6592fc4a46156f92dbcc748bd2c78251894d067239b96cf38b3f33175e5b74258aad63f5098493b577 WHIRLPOOL 050cedb37ba223bcefb3c2802e542f19a89f4c0e0e0ed735cbc4199669e55131f8cf6206bbc64065047945fc6a06ecedb65de2a4c7803bb2b24aa579354ff0ef
 EBUILD swi-prolog-7.3.7.ebuild 3047 SHA256 2b0a190e12578b87a26221677c6dace0464be4c78e131593b74695611e847ed6 SHA512 043b7ae61ba00a1aa11f559e83c4e167ed54d6f2078bfc2515c3c7af53c2fbaec66accf92dad4744d8f626bb8e6bf7912feed7b53ceebdde08a9b2f2aa59c12c WHIRLPOOL a2165c92e974e660355425be5f74a3f062d497ea982227bb4df1134ff4c128491d2883944bbe30fe20f06160bff401f3502074ac5781591470cca48147b88066
 EBUILD swi-prolog-7.3.8.ebuild 3047 SHA256 2b0a190e12578b87a26221677c6dace0464be4c78e131593b74695611e847ed6 SHA512 043b7ae61ba00a1aa11f559e83c4e167ed54d6f2078bfc2515c3c7af53c2fbaec66accf92dad4744d8f626bb8e6bf7912feed7b53ceebdde08a9b2f2aa59c12c WHIRLPOOL a2165c92e974e660355425be5f74a3f062d497ea982227bb4df1134ff4c128491d2883944bbe30fe20f06160bff401f3502074ac5781591470cca48147b88066
-EBUILD swi-prolog-7.3.9.ebuild 3183 SHA256 99cd5a671b280f311dd799c1889a1e7f8fa3bcb2bebbbaf09aa068d649a67558 SHA512 2e49128577742cbffbe54c5b492e03b504a2ae9c7e2ad9fa97450b092b36ad0ff588acc59f380b56c0000bc7c018c4daae20b7e341f6e6d96e79656bd0554f3d WHIRLPOOL 76fb94fffe0c713b753c09ddd64f67834066b5e07377b2d18706f4bd4426487c9e5e24009e207f2b73fdfd5d69baa869c18648f231c55df2b2db3453acbcb2f7
+EBUILD swi-prolog-7.3.9.ebuild 3226 SHA256 d9df9b4f76495b49288f9c381cdfe3572d7894a404d7d7d4c8164e1ca2c4ae60 SHA512 8a4309ace580a971af14bdbf54cfb450ed35087d599e83c5587c165792df2bd9f5c714c561e67c671ce90097fc16e5788d1e97ce164bee82015e3539f7396f5a WHIRLPOOL fb15d24968e9312f876e84b92ef866d16fb20be89f822df01af771e97f4dbf5195e8f98ea1d557873e4f99132c7512fa9eb5a4a37b79b41a58aeb318b16c48f7
 MISC ChangeLog 69903 SHA256 9e6f054c7a5e4f2f47dd02c5e5ad606160cd4a429b7417bc233c339dc1954e9a SHA512 c3b02af62e947a5ecc3432fe5f49fc6eb978d559ad69c73748159b404dff39aaae1a316a677e875f02b06b9d0e0efdd76d79ca1347b1af8625651b074bff4f00 WHIRLPOOL 2708af0202c442f27a40bb2977b7da02e0910f9ae1c60538f0eaf0bb166371b71787e1328655dc60cff56b47918fbd4df97269d870868b273c61f19ab3767ae3
 MISC metadata.xml 290 SHA256 c3f7520ad704de2de8a905ded748a40540801fc77009cc22f49e48003a2cd50d SHA512 0c95bd886652a4c099f694d793fdd85ed807ee99d9ddc65ea3db52fa5177e5a4bbe83ff465e3d00dcb9f99a9735d92a0bc978e2442dc521571739deb7945edf3 WHIRLPOOL 6c267091f56237283a17b541564ced8e8261c19d6f407f5989a8988de9de5649dd89809a82f4ddc6762dcac84e5012a43cad070adedfa964f2ec1de2ff2f81ef
--- a/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
@ -114,8 +114,12 @@ src_test() {
 	emake check

 	if ! use minimal ; then
+		unset DISPLAY
 		cd "${S}/packages" || die
-		emake USE_PUBLIC_NETWORK_TESTS=false DISPLAY= check
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
 		./report-failed || die
 	fi
 }
--- a/dev-python/Babel/Babel-2.1.1-r1.ebuild
+++ b/dev-python/Babel/Babel-2.1.1-r1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/Babel/Babel-2.1.1.ebuild
+++ b/dev-python/Babel/Babel-2.1.1.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"

 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@ -1,7 +1,6 @@
 DIST Babel-2.0.tar.gz 3415906 SHA256 44988df191123065af9857eca68e9151526a931c12659ca29904e4f11de7ec1b SHA512 9f12573d97f688baf0d1fc0f61055e34b67964054e70c8a6c286a8b0e42ce58da4d9c8cf54f94e51b47a5256cc4504a14bea497bd626cfad8c860d952e7a5e18 WHIRLPOOL e08b0d2d6192321f653200b9e4e96d898c12ea8176f7e0fb7c2144d3dfb6c4b6c12b85833b05b1a5e2d9ed8cec3712d09c3b0a1822ca9cc7ea4bf1cb24dac3f3
 DIST Babel-2.1.1.tar.gz 3437647 SHA256 7fb6d50effe88a087feb2036cb972fd7a893bf338361516f1a55a820bf7b5248 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94 WHIRLPOOL 812badf14a74fa391851aaae048ec5d815d6d8f7abce8b918f036243cc45d91ca97281614c2ef139797719077ef4880cfafce88e9d718b3cd633ed7303e4cfd7
 EBUILD Babel-2.0.ebuild 1483 SHA256 2446d31311e08b2df1c8c35506d57eb506b9705e1780f01a1a323cde862641cf SHA512 86a243288b20556dc98a5887fdd9b71cb21b345152e85dd1367599b7b6bf7b2214827b0e1152f637ec4663d1927045ab70cc147e1ef455f7b912d7736c4652fc WHIRLPOOL e474e255253e1b0e14efe05951ce710eb83b75a8d549d527c802df2171d0b8af641b86395ec777434911a3e8f9d7efc738357fbc7e0dfd4071785c9e1c294e98
-EBUILD Babel-2.1.1-r1.ebuild 1423 SHA256 3c4d289970640eca9085248e1424c7b06526a598941bd2cce52b73f6e6f2b0fd SHA512 05dfc057465b78e1ab7c20e17b8e2ff6b08f1d19c3dbd6317ea4c5a423fa74773fca8c689cd48e0a3cce901ace8178af5a3d40fc9f65a52fe6ab2688ce24663e WHIRLPOOL 109bfbced8916f842b548c26344aaa7be516f9f8b813aa6755eac9a0f1ee6705e66716b22506929d4425ecf8fb23ff2918b455907d00bd9f0e64554362f371d8
-EBUILD Babel-2.1.1.ebuild 1474 SHA256 d6006bf312e8803a214f0131504f3cf802c310e2cd8f68d2ad6be242168a890d SHA512 fa477f78e929bbfaa6e1356a91c56a33833459b13f4ef7ba4e64a32c3cbeb1473b9dda18f58e4f665bb58a01a51e20845338817fbdcce1ee3c4df7d7747ae260 WHIRLPOOL f3dfa9afa613ca8e29a577a88484ca095bae92551863e840b168a44ffffa79632a039f49d9c4e1321cf6b86ad1ad57c3806c4fd098c0cb3b88f2cbd7a2a6ab09
+EBUILD Babel-2.1.1.ebuild 1486 SHA256 de908c929a1182e0aa2953da4c83f0662b77cf254bfdc05595c1815b0a8c92dd SHA512 0b38139fee7b76a778d7a6c07e503e1fe8fe33ec1f6e0752cea4cbc888278fd48c60d8e67dfa01885f51c8550a45a89141d397efd8a797fb7eabc763e459e0d0 WHIRLPOOL 29f978df911218f8af1365b7ac89a45cb7f1a07412e40c057aaf72bdd19013e07fc1a0a03b4c8dd4f188f1159401bdca76dca762766e0e07081adcd69735f22f
 MISC ChangeLog 8689 SHA256 ecc462e7e34189d36faa9ea697605f1244348b67f11ffb6cd7d583a745abdf86 SHA512 857b2c63f47d46918241e51a8eca25d53cc13a2c0335775a3314fa3e15d819c05fe3cd7708ee8be2f7be0bc88a8abe913d61f403726efc94a6412d654e114409 WHIRLPOOL e22a0a1136f0e01d76ea94aaa4106dfb208bf42757f676177f595716c3401f36c7e744123d9664a4062acaf4da9a2c4804a32432cd7e14e946953bd7cddf98c8
 MISC metadata.xml 617 SHA256 9dcbd03fdc8526ba5235c68139e33a369b9ea9c174347d28996dcc796b2084e7 SHA512 17ce2935d82d5a51cef004e2bb7ba8f94dad2ad74ee907aa27595b5d3148fbbfe320723b160f49fe9b963b5d7e46c2cbbbf5a48c29e535e52159c569a136395b WHIRLPOOL 64f214546921d5b9908aad123053ed47b93c0f87550031822e8e967aebe302d607d64959f018852c1bf0aced439154512829edbd60bd6500c1bae20c9639090c
--- a/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="redis test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPENDS="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-python_test() {
-	py.test -v || die
-}
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@ -4,9 +4,9 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

-inherit distutils-r1
+inherit distutils-r1 eutils

 DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
 HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
@ -14,13 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
-IUSE="redis test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"

 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
 DEPENDS="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
@ -29,3 +28,7 @@ DEPENDS="${RDEPEND}
 python_test() {
 	py.test -v || die
 }
+
+pkg_postinst() {
+	optfeature "Redis based caches" dev-python/redis-py
+}
--- a/dev-python/CacheControl/Manifest
+++ b/dev-python/CacheControl/Manifest
@ -1,4 +1,3 @@
 DIST CacheControl-0.11.5.tar.gz 13104 SHA256 b78484d6feb17b501267f4048c364a8fc26fcef35ca3ff62bdba63d41fa4cf42 SHA512 2acce5a8be2e409a1a18254cfe71314074037bce3341f8b8fdec52c43500c90bfdb6063b2121c5cf6c8a2fc7c0903e4fd0c15813ffdfa547810b33571d211deb WHIRLPOOL 5e12640ba5c952ee8a83f5271bbbd105f148cd080bf6ae5c2cbc9c6cc20361005aa5cf1a95feaa1a808c56c26b7abdfbde3b7bffc873f26072d23262c12b49ca
-EBUILD CacheControl-0.11.5-r1.ebuild 786 SHA256 dae75c81fc655b6ad1f1760ecd45844588286c84eb5a8f4ba88fbf64215e6616 SHA512 0de64adfb8cc8dc32e7b8479a111fabe2302b63eb6071df8bbe97ac255ccdd2b97575c8d1f96c64ba553185917af99d383ee217d4b7904f53b0e96c2979995b1 WHIRLPOOL dd16da34d7798f1f3d9b9213eb9134b30883ba1ff06cdf3ca77fbd3b0272dff8e5d394d5b292f17f4c1497f5d55e0d1bdcbfb6e56636c60d50d34b5386b2a4cf
-EBUILD CacheControl-0.11.5.ebuild 818 SHA256 7f1f6143c1ee4f0a6c15c2fd6eb20b68daa8be01300f854a55eac818be10a95b SHA512 6a4b746cce141691165e1a90d54b67d1dc2a00eef8c06311a31ef9dcdbacfc86e72bbf06c407f7fc19d005e15d1c3cef7bfd10b3b437b66be22b9f67a5f2db4f WHIRLPOOL 88af80b33a6a34e82d576503a209440d3d6ff60110fe9911738a61b76f589f25dd098112950e818552181b0090464a579c39ab0f5749515d16297147958ecd03
-MISC metadata.xml 385 SHA256 040bc48958f8dad62673527db3c0dbdb8103422d6a8c2e0474746d945a407fdf SHA512 1233d7ca28e12cec231f96e9998b42bcc6753d9704bad1eed964bcff92e625d7afea33e69992c0f822b58d48399d35d61efb54f4ce152a97adac934e4f84427d WHIRLPOOL c19ff5a26485061ba42fc25041969221910f24b3433d91abdb895016bfb2a919093bde4787ea6a88f1b2fc1f6add834e2bdbfa33789d77ff254118a78a46abce
+EBUILD CacheControl-0.11.5.ebuild 882 SHA256 f923e9ac1328a2a8fdb50cde0b801eda747c56d5ee99047498b7ff6511f15418 SHA512 5b795f9bef4c3dcd819f93bd10066ef871e8c8f54d270a6808f3d4bbc369051dff3d9a51d0eaef668fabf762b1d22bbae83423c24078f71d2ceb4b4dda505e7c WHIRLPOOL da249d534a9ae722303ad52f33713cd9e1d85093a90f86f704653306102b3455dada004c4a732cb02b330bf036bacde433bbce33da81ca7a10b8473ee62f4513
+MISC metadata.xml 302 SHA256 7a92839df75070ba329221749ab4c33ad92d07346d83c1ee4c276097bed0a511 SHA512 7a58a1a5972237f78840b5a77b73ca556303ed7944221ceb2051d3c7ab850ba39eed2d9586668c9ea6e234823ab4d0aa5dd88416ca50f0ee2d4fcbf405f0d452 WHIRLPOOL 22c9476024610a07cb3307755102953071f8e3eef4ba44d0d003c196557250fbfadaf1f16579c263cec6b24c54412e1c4438a78caf38b3e197adb6ba488eca2c
--- a/dev-python/CacheControl/metadata.xml
+++ b/dev-python/CacheControl/metadata.xml
@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
-  <use>
-    <flag name="redis">Allows using redis as a cache store</flag>
-  </use>
  <upstream>
    <remote-id type="github">ionrock/cachecontrol</remote-id>
    <remote-id type="pypi">CacheControl</remote-id>
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@ -1,6 +1,6 @@
 DIST aiohttp-0.14.4.tar.gz 1253273 SHA256 2338c8506ce7853ac2df7efba731a3fd015a7ee2561afab0d69ddefb43403f5a SHA512 453626e2acb2da85b39fd9dab01c51bbbbdf3422e2d7ff833e8be141f43d27d046646bafe6d58d96d37457208ecc2347a3724f056152c639c18de99da619538d WHIRLPOOL 42e8e23c3b1c28463617f9137288886ccf2d61fe404e8b06e105e0a48b36b06382a7a58a6e6c91bc38886e09874ba6112300fd6bf3adfce704129a7edbc4936d
 DIST aiohttp-0.17.4.tar.gz 475034 SHA256 a2f122b41f29eb10772f1600ada5fec849c5dc717c1dcaa05c95bf0712af8843 SHA512 bca0aa93f51fae32eff383ffbd7790886a822647e77884fb5a26b6d2673429b61cf5483527297740a4b237b3e038934990df1061e32e6617d6a3da10276b9116 WHIRLPOOL a7abec0b3daa84078beee9057b5dfdf021b7522fa6b7f847f65008a061802f2cd61dee34886b833c8465f0a5379af9cb45b1f2117cd0b386b6ea488f3f9f2b3c
 EBUILD aiohttp-0.14.4-r1.ebuild 734 SHA256 ea777189e15102bc89c5192c3253b492ac6852a1ba6138d16965b05b1f827046 SHA512 cce73b3ce45c7790e7f5bb5919c36182d2d78bf7c761799e81cb8a7105916fad34a5c2618dd8020e42c19454fada37c27fb1ce3350804efe061eb9107403c684 WHIRLPOOL 004b61cb6d407c87a34fe000cb00d29300daa144e235b328680ca0866aa07e21e64f4f10acf3b52e6c55a08fe30fe4b611532089275c549bc06824ae910d0bd3
-EBUILD aiohttp-0.17.4.ebuild 1492 SHA256 3f84c5f7408ffa7ed7d90f306cfbac34110e71db89a57f49e9d578f9167e749d SHA512 e970751a74a373ad490152b6716a7ae6caec98e5f90ee6ca7f0620dfdd39cc349d96be31b34e0522083bb357aea8b14db7296387710753c9b0c5da7e20d26eaf WHIRLPOOL 2a4c8dfbe48f868ab2e1900d3b2d204c8524204e38c06b31b3ad8dca79ecec6da46ecc6cfa5c4fbbaf71d6cb54f5cef052a0f0a21abc59827385f782f74e77bf
+EBUILD aiohttp-0.17.4.ebuild 1388 SHA256 bda7434823ada8577f6a89a50bf45b828f5dc96df4e0600a44d2415b4f82b41b SHA512 094e90406e8a9c86023272f4ddea741f95ef05c0284864b64d795a03f170fb43ed2f80ce1e3bb16502775926169ebf7c1b017eb4725ee8edd755c9f47ddfa233 WHIRLPOOL c3374ecb5596a542fa352dbb6c917ff0caa2af78055920f701988a9631451db4bdd703ed4b2b5024e1a47d6c6b5df4784cc9fdcd26936a07ea5a45cc5dee96a5
 MISC ChangeLog 773 SHA256 d43f314774d7dbdd4eceb98ac5ff6be35cae9a05255707bd0750b3fc4858f205 SHA512 ff5e07adfbf1d13edd6dc91154cc7f012b34856b73805db577691c8c804e29feab3e4ef855a19427ba8371dc387dbf62b8f3f451d4c10a35823bedaaf538cd91 WHIRLPOOL 4e4526554a53a38bc1b88243db60b7af3168341dd35e9917b6ada7bdc9ea1a9d3aa540f5581d50e6ea4a6f8e8216b43761b9cf636a8d7d18e7aaa11629a89baf
-MISC metadata.xml 460 SHA256 04647b5971e1af48c65f2a948c119f09fade0c280557874c7f35d4a34c16bd7d SHA512 ebec156499d3cef6608a02ffc736bf3b61d48446ad24efb34784a860c2337d70b89fe4ded61a784ebc4c006435b06329eeda130a49c75bb7a7804f459ab5bbfa WHIRLPOOL 087a47864ac2d6081822015053d286d1aa32c72fec68918b01722c615a3dde8094ab537f8d948305305ed2a493161c67a68e7c4ec878e853681c57c9238ead52
+MISC metadata.xml 466 SHA256 7b1cacbb1be3f36f3c253c3f540c45d76967fe518472dc244d153952bc081432 SHA512 3f7b7275a1615a210c7d4cdc5e5d46393e0fe15aa954c7e2bd070409a5b46a7edb90a3aa48a7e05f73d94cb7d3ee7ee39904ee5f622eba49df69abdc6476ddbc WHIRLPOOL 9d61f11b197e7dbfe7bf2a40f68e91480cd0df2c7d8fd5827bb615fa9e0ccdc3d33c76a457a840c38d1b07733f0c6d2ce37889e4a9cd7fc4a8026b18431efe7e
--- a/dev-python/aiohttp/aiohttp-0.17.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-0.17.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild,v 1.1 2015/03/16 11:08:45 bman Exp $
+# $Id$

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"

 CDEPEND="
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/metadata.xml
@ -6,8 +6,8 @@
    <name>Aaron Bauman</name>
  </maintainer>
  <maintainer>
-	<email>alunduil@gentoo.org</email>
-	<name>Alex Brandt</name>
+    <email>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">aiohttp</remote-id>
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@ -9,7 +9,6 @@ EBUILD alabaster-0.6.3.ebuild 465 SHA256 54f1462a5bca53d0ac7a3f53f0706de1f74031a
 EBUILD alabaster-0.7.2.ebuild 485 SHA256 c09d05cd17222893c4c2a71fd8e52f42d47595ec940e8e5b2e08407122555be8 SHA512 cd2699b8ffc9ef6c2245262c3bc242948238e8c834e1d98212de9b77f2ba657395f4cc45399a0a02c05164ee205a4153d35ee1bbc847fd789734714f02b0ea1f WHIRLPOOL 1042254ac2d987f3bbbbec8c86641209ad052450f11bdcf99ee43789c863657ff27ccbb0dc4e7e11ebc7031fc2008f35199a33d44ed9469e920fbedba8ad42f4
 EBUILD alabaster-0.7.4.ebuild 490 SHA256 058a995c4c03933500f5757fc290e53dab3aa34f9a8855eec69ebf33a6b23002 SHA512 7b09a01716bc353d648fe5f512c9b6853d29d280d3e36341735c50c011dfcf042adfc3d1632e20e9f84f70cfcfc94736a8f3ac87788ac8493dc61b8f4d7b80bc WHIRLPOOL 097f41e48b53847546496f3d05693bb56aa0225298aba84c8b48946e55560feae43c263d4c57961ba1ecd4d91c70aa7f63b4fba2bcd2f3294f7da3c954b075b2
 EBUILD alabaster-0.7.5.ebuild 490 SHA256 058a995c4c03933500f5757fc290e53dab3aa34f9a8855eec69ebf33a6b23002 SHA512 7b09a01716bc353d648fe5f512c9b6853d29d280d3e36341735c50c011dfcf042adfc3d1632e20e9f84f70cfcfc94736a8f3ac87788ac8493dc61b8f4d7b80bc WHIRLPOOL 097f41e48b53847546496f3d05693bb56aa0225298aba84c8b48946e55560feae43c263d4c57961ba1ecd4d91c70aa7f63b4fba2bcd2f3294f7da3c954b075b2
-EBUILD alabaster-0.7.6-r1.ebuild 459 SHA256 00cf61d775d3a32ad624bc466cfddeb912c899a438e9c369f60456382db11159 SHA512 306cf5e33fe365b46e134ec8d83e3592094936bfe5c7459aa23d5efb9be73776e189e32e933dd14afc0c919478bf5b7c76461365cefe0ee84e01b75d31a2828b WHIRLPOOL f41d3aaa1f71e804ff07a7b29e92d7df765d8d8acdf0495f6ad7f0f077a508ad7dc087898bffe830baed5ee95051cb418e6c01d95affc96fe9e8ae83516e1fa2
-EBUILD alabaster-0.7.6.ebuild 503 SHA256 7d604c1998d3072a9d0b71ee99b1d7b716bb03d61b49a2bcce6116c2a8d712e4 SHA512 49152284d9606d0938445d6fc8f88c7cd5b32e7b9e9a8dbff06f274fd3bf9288a9a018c71314e4e0a2ad7f7bad88977f57fa9a24e0d933c18bca806d06660209 WHIRLPOOL 5ba4a6f6c3ea34553d6bb30d590d43937226296477de496c9e61d17bced41481f9e6091af6f3d3414fb2964f9e002f169db502dd87bc7d008c285907091327e1
+EBUILD alabaster-0.7.6.ebuild 531 SHA256 090a1710a843f66c1bd51758263305780dff22d92783575d265af650915c4352 SHA512 2d73373ccce7a53f6dbb70ed1ff7bbb7a048fb385b030309dbe65e02040d642592743d23343f43e7e3607deb91b372d4630bb19093f96b5f9e5720bb631243fc WHIRLPOOL 7b98cf341c21de8b2c0eeda06b80c6476a0ccc6e90eee74ba3ab41e2a0ff6c7566490c145cd764b8c26e2c35e359cdb4694d004ec4a4a05b9081180639a02611
 MISC ChangeLog 1723 SHA256 3a0d21bad81e5503241f5558582dbfc48897e62b119c02eb0ea926f2b760dbff SHA512 6171685e51b0a46fda8dbbf53282b2b7f329e8faabc1e662bb5142f21d668d064ea0ef4e115385f994e8927ec775824b6805ce4356932955cf2806d7d4459af9 WHIRLPOOL d5fd07122891cb7f285712189bc8f023049bdd02d8d7f0ec62acd5b82c8460b05743d2b0ccab23aa62894ad0598aae926d3bfa4bdaf56c13e1199d21b85d5831
 MISC metadata.xml 299 SHA256 917ef5794d2da43651476532b395acede1e3a3e01fb801944ba8520a59b5bad5 SHA512 4e8fa4ec92dfca21cb78cc2badd0bb1c5656069b538cca8a235628f11772f4ccfb40964016579e4742f62e5f04b95ea77fa273982929b350862a89f47880acb6 WHIRLPOOL 74801b4716217145a3aa1ce823b39d51359e1d7b0d4c2a7b798fe7eb9ea9c6480330073e7974001d0243f16515bf804d61cf87bfaced33744a030d03e7fa0c38
--- a/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/alabaster/alabaster-0.7.6.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.6.ebuild
@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

-inherit distutils-r1 flag-o-matic
+inherit distutils-r1

 DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
 HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 SLOT="0"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@ -1,6 +1,6 @@
 DIST apipkg-1.2.zip 12842 SHA256 ea86c4660e83015b6a3faad106cdf5a8d640688a93b84b93e8b64c60815789d4 SHA512 abd00a7c36914b9f79d5a54e1d0facc89fd6673f86d774784cd9a3a0e8e913cf3ef575914bcbbe4d17464b09e8b57d94c761453b2b19466e7dc408f321d22603 WHIRLPOOL 5693c8f1422d96e702eb929c2b3fe3f1a33b7d731ba4f6dced2b42229b941ca87848a31d19c2e79b0ce6fc0db98e24e6c81775c68374ca7f7bed59cf9682d049
 DIST apipkg-1.4.tar.gz 11224 SHA256 2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789 WHIRLPOOL b0162094ee5209fb06727b5ad6d346e5738af9999f4fa21081cfedd4607d6025dd1d20621fe6c2e7801e5b405757987a6c0d63f698d74497401053847a9109bd
 EBUILD apipkg-1.2-r1.ebuild 830 SHA256 3ecb9e6214aa863ad1d74d7af73445d03c838fe5b01a53b085de05dfcfc9b44e SHA512 69bff86052f1e51f34d28d29eb1ef7c038787fb328b9097f9e7a1a2728d0cc7afa8f64c6b8b38c3618ef937f92d32330e2ed17befa2dd9bd400e5c507b9a51ca WHIRLPOOL d776e93d76e98e54612793f96fb521cc9d98bcfaff0ce901a693dab1e812065fc82990a7da1c2315baf4cbd349ce911f11d79ee72f645e46ae14a0e78ee3a3b1
-EBUILD apipkg-1.4.ebuild 741 SHA256 07e1b6e926679e27d7e735a8100913352f18bbfd0bbfe79c778b184a65168d52 SHA512 069d6b950dccddbb4b1406d2e9531be2dfaaa3fbaca456ec8c5d306f6dad66977201bdb66a64129934a47509ba3429ae9c9da1c020579a866f27e72a60802e5c WHIRLPOOL 0d4d7bf3c512fb07b0585b44302916ac13edddcadaeb36173bf3d6e52ddbd6276639ecdd5b6877be7fb2a77e1038d2e6b362331abbdaab82cc67e36c90924e29
+EBUILD apipkg-1.4.ebuild 745 SHA256 9cd3408f94de86c804f703a242eebadb077ae037afea538fb9d7b2b4f4cddb89 SHA512 f31f1db617b1f28cecd059a040f10bf40201dce5837f8b578cd85e2499c4cd0d4dc57356b485d42925de8b5d39f9ef1d014d052dc3f389e78b5178ea802b3afb WHIRLPOOL 6a54e04be17c08bef52b9fa9eab141be3119d62d2995f684eac72b9eb50aebb74365999e06ea8784483ddb7165893b92a6bbebbe3710c6b63f38ef8c187d02bb
 MISC ChangeLog 2205 SHA256 81381b50df52a558880cdd01a8c476edd8e0d613983bf7ae5ed41c67fb0bc76c SHA512 ef809eb2b0f860f7fe671ab3da0568c4708a2b754b2116a51c84992d33c8fce2845c1edfdd7c98acf3b47648812a1e4af6981b58971b098c6b898aae3fbee9e7 WHIRLPOOL b70f1295ff952c183189c9d1accf54c06bde6b8878fe7c2e134f6661f041b135380eac0be2f3c1040300f52c2f0828219b77b0374194b64db6c12abffb39b7b4
 MISC metadata.xml 229 SHA256 98f8dff15204a65bed3f529a9659ccc1e23f26613724f4fbc4614a8c4a769f8e SHA512 6545bd0b4283857fe59a3953ab05505b4401059f43be2307e70851c0f99853e40fccc1bc90cea919b01d9474715dea55c68ad94b14b0746ffe488843c1a8bbb8 WHIRLPOOL c8b8743cc8833fc1adb5c508f031e1b48b79b210a116c3758b8985bd99eb22b79196376c2a260908349eb82461c30b3542491ef6d5302c3f9d57b94504054704
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )

 inherit distutils-r1

--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@ -1,4 +1,4 @@
 DIST backports-1.0.tar.gz 2070 SHA256 ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740 SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37 WHIRLPOOL 105962b9fd92a4ae9cf6b9c54a2306b92460971efa0bec7885167c9197fa286be01f077e0ed35f56f6c341223a42f4e2ab217f745283ae1a0ffb70544e1a5d50
-EBUILD backports-1.0.ebuild 540 SHA256 380c7b40a34d0a59c6548a94b960e46e15eb2d564692e8906c3e0d7d9c635084 SHA512 84c198af3de61ae565a85bb6dc2de9e60298c1846b9da0db28324e10c1ac221a62af54752566a6fd6652e13859743228a48b8c3ed0c3a6fc9d18d592efaca8a5 WHIRLPOOL 98b572eae47bdef1eedc8b4bef431cf0c528b4e84dbe3e426ba117d109827828637328825eed35cc13d9b4f8fad84fad7b93985927b4548e710b570f9a20aacc
+EBUILD backports-1.0.ebuild 553 SHA256 af74fe3150a3bae5eb1a82a4d0a7af51492eda4368da734fe7092ad152471e33 SHA512 f55a87e6241225641a95b474d50eddf363d73554ddcb2cebc4519a16351f8ad821f4b496a369be911d9565b5fd23352e5020945c3723c709528ec00d0396c157 WHIRLPOOL f392e25949ab97fc46f2577460c68532e5fa033cb25f01bdefd88e8c81d766af3563cf35c468fab496d87696aa1ccf50d396ce344569159d4bcc1f512ee5bd1b
 MISC ChangeLog 1720 SHA256 f05a66180f1562ba8a0131591aeaaacee2e7d1f429e9c983a5238ddce0f6aa53 SHA512 3de605ba80fabf3623eaf87001105c235ad0fee92f81bb67d431076b749064bc9122261fae639099706fd4ab8eb3f3664e49d091c292acdb8f16eddfa4422aeb WHIRLPOOL a52ad2ff4299191ad6791404a888db296703db1de0cd5931300d2c7d4b943a360f4a5af9cf505d194ebb1f59df5f0d839255ae6c2f8453f90dcc6730a06ec4a4
 MISC metadata.xml 250 SHA256 78392419d37997c70ef73ac9de9de536eb9070a334bf89816a08e8ab320cfc30 SHA512 7b15922bbefe87e05ed6b6288695e05e3316ea9e0cad361658cdca2b18379cf0445735073cda6d99c7b57d9d69c1fb473af3069000697b87b304acd7a990047a WHIRLPOOL 54e0875743c8d59d4a07922fe36257c2d8503b2b5d92237da2f43fa06b80cad89c603d42f83fe3212b88a4372d82cc04e5fca38b323753bbfc5187fde711be8b
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"

 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"

 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@ -1,6 +1,6 @@
 DIST bcrypt-1.1.1.tar.gz 39714 SHA256 f68700f4560d90e30b7bb30105b9553000690222887625209aa8a14826ce0461 SHA512 b6388e69dfe4a7a40a304745607fe23fa2cd6c0f874b09c39849958f4d4c77cd5387c2baa79de69e8809c0df8841b085885c83f00bc13ee5a08b3af6c04d721f WHIRLPOOL cc5759ab03c2da11a5b2f3da741957f250eb4b016aa6e5cf3fcc3a28f527219343c321dd432235ec99fc67749edbdb6806d410d6f0ca0afad0c03374ef019b20
 DIST bcrypt-2.0.0.tar.gz 38748 SHA256 8b2d197ef220d10eb74625dde7af3b10daa973ae9a1eadd6366f763fad4387fa SHA512 61ee83c291e65307d1094d4ca80d58f823c04d8389384e33265a3d4d7537ef0846ba07e23ab1c68501851e9b9fc3cc927e0137d52450aee6af938c91c821c435 WHIRLPOOL 46484d780f50a449e5c7d40f37b20b0a9baae4b51a0facb9cb774abddba29d4353c40e274f57c101db572ba778d134d2069180ad8ee73dbef55406aee5560721
 EBUILD bcrypt-1.1.1.ebuild 963 SHA256 1016abefb3c0a844b64e014c400178b7b6795062ebd2b401e595e09fc7ea48db SHA512 618b2f999be915d83485827cb35bdde3e992783a6396a2c762a7d1c7b7790b5425279d82fe25e971ce9bc5a4a8a9da672aa4a2edf4d78d43d5b8651ba7193a30 WHIRLPOOL 0766e1476ee7340242be6ffbd1420b0685bb423a5654750b49652aba30994ee608bcf7af551a181330e3f68980d0c3c1ca8f1fa82fc8b4c088b269479736d168
-EBUILD bcrypt-2.0.0.ebuild 970 SHA256 a092a7fc69d555e58bcad40cdffb934bc1cfb22924ab7afb02156c2a583954db SHA512 b3ba4e007e090f084ebff3ae381b365c71a57bc4e18ab81edd69be7e3203f0bf4d69e574fb652b3481de270cb99ff5ca126c17a71fb4026c6a36292fd91ed4d7 WHIRLPOOL 083e8af1a76c2c728b410e466cc47a0c9037cfacc5c5c5dc13e9d3939781d13b2cd69483d0e9f2a86c5ca64a19fe6ae1d168e08cc887578cbb3566d534f63156
+EBUILD bcrypt-2.0.0.ebuild 981 SHA256 92a224e88841eb8e5b4e31cfdd36c25c1c8e0e69b45ddb9ee8eda59f675c9dfd SHA512 645c983e7e73eb0e9cd8ce729161362ffb765f7f27fc88ea324521fe840e0087d5de12ac248ecb64a23790031a4c93c33e398a983f90c5e801b2f87f973e7a39 WHIRLPOOL 932ae192dd7ee5e8752ada378ccfde71759038c0791babf98ed7b651723614fd744dcdf7e6170e7bcc28ab6bf901a1d35ad5d9fe64246166e28137ed15083cca
 MISC ChangeLog 2614 SHA256 5fd9a7d11a0579c5bdca9922642cb8931eff05025a1194c9b6a4085f1a2ff3ba SHA512 06f2802809a3aa4c2829e1351f91c9223e2006c6ed819a9b4172eb32f6162440f5032efbd0f43984078cf6f5e23ab62dce81e1013d2b0427620ec3959a2067be WHIRLPOOL 849d5058fee270a11401c62535db30f9cfbf176b06e91567ee7307577812c548e00be2318bd72533ff0109dd82e78ac94cd74a01f1dc1a3897a48755d9d9407e
 MISC metadata.xml 312 SHA256 2108ecb33039a07519956bb2f572fa22f16bec7d4bcad5e24287116f22613af9 SHA512 a24158415ec5c0d8cab5ac4c1d2a713ee57c9195ff32b7e871db2a1542d466056ecb1ac9b35e3d22dfccb4857bb08db1907e0300c1a5346fe95e9804e2b665ac WHIRLPOOL acb12e00f4329e82d83d280fc25d7403d170248a20bfb7ece63782300fd5060bdea06ed4811335faaea3e3e3431e219935d2126363698635027e91cda636abca
--- a/dev-python/bcrypt/bcrypt-2.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
@ -17,7 +17,7 @@ SRC_URI="

 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""

 DEPEND="
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@ -3,7 +3,6 @@ DIST certifi-2015.04.28.tar.gz 370682 SHA256 99785e6cf715cdcde59dee05a676e99f048
 DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7
 EBUILD certifi-14.05.14.ebuild 480 SHA256 a72967d5b06f1e78bf26dafb0443f5291b6a1bbb7527e3f6a7366b37d05504d0 SHA512 b122304e0f1df0ae37b325653808f73f2ea55b197af8eeb60b733d3445344b565a6ef6217c122b65b2fbe98cbb19b8eff2d0af851a7a556375e843cf82d69f0d WHIRLPOOL d4f7a9a2862db816a4276436ddfecee373699e7b25c138df1ad8375ef764e0cc36ed738573705ccc73053121654e64b54a343dc6d95de3ea862f58287d6fa240
 EBUILD certifi-2015.04.28.ebuild 488 SHA256 c8b772d4d83bb129de8d8489ba7463b59930c4a0f35a47985734f0f6c900674a SHA512 ef4917da6d4e4e31c42d751911e829df1c75b20baf8cbcc5263b7d2ee7f84d8e8f6ccae21424e5be023f66556459d16ec363c8835edae447a28af0e4b2d078c5 WHIRLPOOL 4a0b44b96f63f8f2f858e1dc165eea04c8b587f35eabe2907a2ece9c3db9146d6bcdf5045419b1b82025c5ff4560d5dd5cf8d0edd71cc52e4f1cace89dcaa48e
-EBUILD certifi-2015.9.6.2-r1.ebuild 491 SHA256 2e414acfe2acadc8e9ee627b68cd114fa13e1832ef73dc10c926c39ac435e9bd SHA512 8e9fd8329cc0a5bf70a9f0fcc0a765bf2ddd19d08f6782327303740e4f0e488355a8891a2e82ca23850a7c833d880ac74b33508211e91403bb1b78d11a5982c3 WHIRLPOOL 5e57fb79aaf90ff05ae4026d6d5d63c79653c01b3a62ad30c76b21de40a40bb9f284e31846916523a496d2c2ebe40b7bd722885d332462ecc0620ca6e12545d5
-EBUILD certifi-2015.9.6.2.ebuild 526 SHA256 41128e91faa5f7dcf423db86a50386da05496ec9dc8fbe9dfeec067576ac273e SHA512 8da9cf1503c3637a37ded74b77836a2228dabca1e36181460bc522ad0183f0b85e9b9f85dc8143fdef1b4ec60de4256f834d3de97f19037c24051e471ee86888 WHIRLPOOL 2cb914a1df3ac4319bb4ed81fbee4b590c87a774b4edc444057aa1f14a7087c9d184fa2d1c5b1713fa91490cd9a8e2e3170f7ad6c1b5a776a47a9a5f1d6ff1f3
+EBUILD certifi-2015.9.6.2.ebuild 557 SHA256 b12587bbce9165df0fda46b9589310dc1ed6938bc5ff274252c3a4dacbc02b31 SHA512 b5d3a9b82b0e0545ecca7d5471e0737ce75c65feed2824cf506c690cf3662003ac4e5461d176997774482a15cfed89e97e06c4307ce7ea0459fbccc4b0fb2603 WHIRLPOOL 480ffb4e92166de6527426e892c42e97d3b134389db8028b0824d2d974f0c766b9a8c3309052b5b936170ee7145d706bf8a46c98ce402aa853bd82b58fcd4688
 MISC ChangeLog 1269 SHA256 7f03c766028c0a93b71ea9473b1da396493355a0c331925225b1921f1f48f811 SHA512 c37a4995e51cd9016e3ac7d51580161268f6d9c1a9dd427f4645e84a8ab1a6663da1970ae43bbc5af80be74624e060a72fa35be8b0c5c6660563a6132236c74b WHIRLPOOL d6103146e2677da460d722e33f5ed663da6f5b368a3ca3d366107336eb043bab7e840963f50b30356aa9ec65b6bb4a2c2093cfa7e8a3e9d26e75f238349b53a5
 MISC metadata.xml 235 SHA256 53b01daa20598a51f4c88faa89e27f1c627bb8230fe784f062c5280437bb2def SHA512 8cc15895ea869e7d198678ff302780228d57405da368f5c0ea541e115c6bb6e965dd9134b25200c1b971f289d6bf16108ee4ac2f931d76b50ad811f628d5cc61 WHIRLPOOL af4f20f1c519548d739372eb022362f38edf81e27cba0adfc72f06bd8b75df1084d263573cdbce07d2df6b5d96666bd02cc4af1a1cab11fb647d1b363be55ecb
--- a/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/certifi/certifi-2015.9.6.2.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND=""
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@ -7,7 +7,6 @@ DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896c
 EBUILD cffi-0.8.6.ebuild 1093 SHA256 f5e92643f786224d18025c444ce967cb97326131538e171276547feb562480ef SHA512 6a614f654f0a1ef88bc2b656d7c9ac7d3a8ad791187fd47b3631cf338c9aa151572a8feef2c0177667aa62b85609d50c36f4070d13cf4f4a0ae7b04d084d66b9 WHIRLPOOL b36c1eb6c3fb5bab8fe15a41ad3dcbd4a69626b25072424e59289f1033fd0054968bfcfe8223f75ba3be6746daed1a39918d9c01d9bc5a9002dbd0c0f188003c
 EBUILD cffi-0.9.2.ebuild 1101 SHA256 51ab4e953be791b2a22c23f97285f71a335a96f6be0a391f400845cf39f779f3 SHA512 0078aacecc20fef816880baaa1c807651457c67d4e341fa2a456deb44ae4a72a8069f94d1834277fcc154181b8848a7716c53179a1d35c0b6d04af22b2cc7401 WHIRLPOOL 8b44c391fcc85b97bdd19ad89b699b0c315ad967e039aa9d28ee5541917a8646ae3606a4a0230d716f437a99df56eee55f33f4ac756f073974f70f7a8841e11c
 EBUILD cffi-1.1.2.ebuild 1144 SHA256 fb32713b313ae8b9e7a451a31d78e66bdf9aef36536004bc43eb2951ff9a4180 SHA512 cafa4d59ae0d0e786ef604cc4f62f009ae631323168854ee486683d492a700b6e687e0e6516cc6e7d0bf30023a165bc3eab6ba90e1288e6fa88634fbea2abfc2 WHIRLPOOL d462f9f7051e47231491de85e497788599783c15502741c71f2d64320923875f0ea5f1ab851c4b4d34dbef23968755ca9a542c9b99c3f60af9ffc24f77fd175e
-EBUILD cffi-1.2.1-r1.ebuild 1202 SHA256 cc99adb7ee5d15924415636e9e4df210902c987ad763202e8ac4b2e3b2d3941c SHA512 9070b828d79346655ed9ef15180361904b213e1a2ccf0481914d509f4baafc734aff5dda8be51f2218863e12b07ea01e19486dd798f9a069d5f50f1341bfa2f8 WHIRLPOOL 0c163a3652b7042bfaaaf7b40c10bcee7ad55de8c4838500262ec264831a9b4085e1d7fb8ca837c8a59d50001c318c8085878225f30aeea54b259aacfdb3cf21
-EBUILD cffi-1.2.1.ebuild 1258 SHA256 fbbf2d9cb3d57412ec8550c8cb8ef0225a3f4fbea000fe946fe83ded3703f9cf SHA512 bb7e60346610ee47f387c24d126e683da9a215aa74959e71a5fe4196c80f30efe8863d8decb7d6d052d5f7055158dc9b76267b1639b2079f171b1f145cd7f55d WHIRLPOOL d627cf5e0e2ea31cada3ba599e556b7fa2435b484e2b645bff9a82c15bc16eb875874871a4662d09a4187a32818899c6baba1ca01d2bd79192d1c96cf4661566
+EBUILD cffi-1.2.1.ebuild 1262 SHA256 38067e70ed55329ed85abc9e3694e59f4e54ca5c397c5c0bc2399b2f3ad2f3a9 SHA512 4671949faf93a6f501b6a165f217b9bba9cdb17e74f412db67053ae5b482d28090539d2572816ac91aa587ca4f05808b204c610f89797484eb209dcc5e0c2f1d WHIRLPOOL 618ea56de4d02c14ba9d2bcd9109192cfefc1a926788237c0fbb26d6f016b8f8c33fbced3208d307578fcd5dfabbb4ee76495157fde01e830761572786ed97f1
 MISC ChangeLog 9260 SHA256 6943a2239cac702562be97df74fac84a2622640d97bbcf63aeb82a87851178ac SHA512 57e87eb46ac94c5d3edc4c680d8fca3b314c56f04699a243a43a09e6eb1cb8af7f761be83734df2e40f23fbc18d4d8e24a97aee40972c6499fd510c1f1e9886e WHIRLPOOL 2986a562f36c64795dfec0333fc68e1c82b7c71f48fc7009a9d01046f48f7519a787289e7023ae3eae34c36a24b593d9cd1c3db755fca2a200282ec2ad1478fd
 MISC metadata.xml 232 SHA256 95f5f76f9aaf444110818d590c1e1588635126f7040387a7ffbed3a397031771 SHA512 fc7f390ae5379920ec49498047782a5bc2983925abaff0833aa3521028ba592ef6d5b5d02f8d39ba8a9e530cc1be84e30b0ae33e95c0471bf8233de5c90b91b4 WHIRLPOOL 0c044106171ec8bfce471d1605c15a3e7aace964d3c9f00075d1d57db1ba83dd4c33ade080fe34ba65bfd0f2ad5a02e175deb29cf6301c1a6ba49312deb27f0b
--- a/dev-python/cffi/cffi-1.2.1-r1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1-r1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI=5

 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )

 inherit distutils-r1

--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@ -1,7 +1,7 @@
 DIST characteristic-14.1.0.tar.gz 24612 SHA256 91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d SHA512 21bb40814f405c73471a83e15d1cfb07f74ebd157e647799bedffffd3909271145347eaec8ec09470dddad7224d1a15e8984a75f1fce00bbe20f9e1cb385f9b9 WHIRLPOOL d8044dfcbb7d75a383834bee842bd619b4bec65c8a0f467a563b9a80ee908bcf5c7de791eb220f9ba3b35a259a9ea6c6985f743518e2677d8a03a62db70ad98c
 DIST characteristic-14.3.0.tar.gz 26993 SHA256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83 WHIRLPOOL e32b2801c1a56a9e6093c82ec9db3c8250756dd6ba80c0d63ca522c0a304e48920bf9cefc14c8491276365123c95f0e311be58f5cdba28dbab93391ed1455ba6
 EBUILD characteristic-14.1.0.ebuild 1117 SHA256 91257230e34da9b8d63ff54b528d8d923f9b5ecb395448c04e2b10144ecc6061 SHA512 f63617e6678cc0625e435e7970f954d84d7246b157e2c246787d15ee7316b4b7c17f12932c6af1f02a304d73437d0200e98856d721f45d8901df88edb8c6050c WHIRLPOOL 3b4d08ac0899cc4a4b2973e5af9a4e3cc521ce43c9f229a9084cef0507ac03e5bad4b63ead371cb11e432c290f846c2308a6ab09e326189722cfd987edcfe2c1
-EBUILD characteristic-14.3.0-r1.ebuild 984 SHA256 048ad4d72a9459aa194e26c15d6cb40347ed58f1d87d67f809fcdc10a25e7e56 SHA512 411d9b8335d85ce1d36a7b41398d015c313e15f78d71b8dd2a6542bb609246fe43050f6b20e9e2de3f0048fcddfc946eea3cc2be6e9791bdf6b990022bff6178 WHIRLPOOL 92c41cf710d7e5266ed25f3e0ee62845d12078ea8ace94d6461d99f9ae4a2c761312694619cd7f56184a3588061316ebaa423c3480391fc3251c22a673076925
+EBUILD characteristic-14.3.0-r1.ebuild 1050 SHA256 206d66d4105c9e4e46b3e3238aef9995739d38c024b466731345eaf3af04a0b0 SHA512 8c8b42cb74f3b299ca125057826cdc147b0f25135c75e9b250872c48b9164c4d26f2309e0d7ad429c10939c64bdae2c1869b16c3483dea1ce7bd17205f6cf4b9 WHIRLPOOL 404fd6e77b19f6e2aef863af093a0158a8632a40b786f01d57444bc46da6d7837b7b54354d72a5b4a0affc6d0a04af45a432cae8e8b2f854d791b962ab523b95
 EBUILD characteristic-14.3.0.ebuild 1139 SHA256 048a65365daa6295edc8a26626b170d012be31dd780ca53542315e1d612c8fc0 SHA512 7b3a1a426386a73b49a6040988e1a0378d8a565692f48595571e1059922293d9d50c1927971908aed313f4a653a7362b59e17830d4fba7839e8d3f7bda7f79f1 WHIRLPOOL 4782dbc109773902684ab3ded2a104eb43d4094ee2f6abf5ee3c58cd5c7e238bc79570954f7dcbfc717668cc01bfff058037bdd8d5dc8f6547504e81c2cf15bc
 MISC ChangeLog 1689 SHA256 0198ccb168e43e26db3751394262c000aaedf93642252b7876a4c462e502af30 SHA512 949b82635834574f904497906a397f6dbfca4bda40d46bc37a4173a4b4f164dcd9539e5fe7c4a997ebd99dbc8d6cd88fc671fc97530a6e99bc555fb70aa7d13a WHIRLPOOL 170976341023e5dc6809fd54ad1e9e02e00178e537966a534a345d5d2c79290878addf1f014d020be4742f26b4f645991b8bdee7379bfc35eff7e050719ac936
 MISC metadata.xml 304 SHA256 39c9e2124893a0938da71a7c1a0fa8b5f81cf32674923f500d677128161f507a SHA512 ba7d71efea2f40fecb5ca5f853177da46756859ced77d37bfecdb48c7fed3684409f63766cf52e1039fceeb2d43b2bb6e5bb87208bcb9cafd90e171ceb73d78c WHIRLPOOL 5b6322570b5be08a63afca60077ab3a5e544c3c28d5a721ef9950d14cb5dca5d0c3887bf5a22cbde8d352bfa93c9ab63cf8614beb1f206244ebe2b30ddd36308
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"

 RDEPEND=""
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@ -1,7 +1,6 @@
 DIST chardet-2.2.1.tar.gz 180319 SHA256 f1964f73f5ee9b7e0309098b9512d587fbba6dd5d1f3797b1c95529e5241bf09 SHA512 87059b77b14c39fded7f1287f8eeab6a880e21f4b49a3aa103daf537bbb1e237069347e1953ebaa9a393bd4dee01993873c84aad3c00536ae34784686aecfe68 WHIRLPOOL 1cd6838823f8effd502c3049d13966ac0888bdb91b34489caea8666f9802967fe6f86565ed827e609cb614c920cc9f983bdecc27c30bb2abcf4420731a0a620e
 DIST chardet-2.3.0.tar.gz 164346 SHA256 e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa SHA512 d554c9b4564905a2b6c6971aaea2a812174d86b58137c6a2f9d54e2abd2395e6529968b2ce3ca2d97c717d2bd0bd80ab5b98cae9afac1a4add9ea305145030dd WHIRLPOOL af17bac2778a86d6fe9643a512a307cbcf92e4b43238b2d3d2bae53e646fccbdf40f31f41f9452e7d4f4c84d1ee637199af841a828d49f3452190749fee284c1
 EBUILD chardet-2.2.1.ebuild 609 SHA256 5c54c6c39ff71708798cdcf8e2df74a063924556a288641aca0ca750bf06ebea SHA512 256e6951b16586c89b73732368fe96da137af15201c8d49174591105b3fff05a5df39a237530eebeb361876d849913d51c695eb1eaf6cd95daa3bb6abca95934 WHIRLPOOL 0bcd41f1eb07265ecd310dc128d12ba5e08c64a4ca3b9410dbe2dc252fa23250cb7c0328ca2f4bf5c28854f7160858e98b029207795c8808ab68cb3424c9c6cc
-EBUILD chardet-2.3.0-r1.ebuild 576 SHA256 0e5823c74ab40597e60cd10ee2257e413f9bb3f7d18f757cd8b2c38c9f4ba45a SHA512 ba30c69c2cdcd8e1afa15f1fe7a936c89dd9fc3e9c3ad1cdc595c717a3f38de0550bad816f776cfdab6fc8fdcdb470f41c365d58bd442868182c45386964b406 WHIRLPOOL 4c8113651744dcd88e928b58bd8674fbc98130f0935527cec1d5e72d230b8c9ebf2235f4a9e04d1e45e11bcd4d99398bdc4ed74c4e226d54ecb3c056f5617a81
-EBUILD chardet-2.3.0.ebuild 619 SHA256 b267d1936d9159a55ec035355e0a91789957f69cfb622c01a69cf9881b6cf494 SHA512 ad93f06cfc735e68707fd2245ea0c01523c2d3c09b1d21627316c6c91b129649ccfd4403a26f34f027069cb32751e42b586d6b37cb9211d3d0cc8bc84cbf998c WHIRLPOOL c0b2e314df1f70af368ae91949a8410f4bb946eb111fcfa9948e061cebc5827598731f9ab56af77eab5aea6fe18dda92afce29c28b91b308da56fecd3e0ba962
+EBUILD chardet-2.3.0.ebuild 648 SHA256 3e0b19f81ed4b90fb324a626677636fb8a08d1215f450c85f59e69d2debb816a SHA512 13ded2aa71eba1fda7e6a1702e5c2d3e69dedbd50d85762f69cccc7fa7fc5c83803404b42949c8e7b599f36c0e9a513d20069fcda1af6d13ae1ee9f355f7d9ba WHIRLPOOL 913467d93d6b36a7b84019164296719054d3cbbc62c7403ba3f80580e39757c6e817a2dd008898208c94af1c93df265813a1db8ec3b5e619a6b1ed0ecc179a13
 MISC ChangeLog 6001 SHA256 fb68a71e0e80c09e0f07a039adc7ffd2108422ee1f9a49879a5014a1d08e210d SHA512 2126c7e8fb3b01d5d7823bc4f1010630fb6f5167a9fc37ec160d3ca127fc592ec9a8598d74339a3237c04dbe89d1f45be9012716ac16da1838e880733b1907a9 WHIRLPOOL 92b33cd4f5d0e5cb16d4d68a3528c1f99461c187e8e672d16ed70242957e99ba7c7d0ab6101a497944866b4c734ea22c2e11f8b0d8aea69ad190fdb959363477
 MISC metadata.xml 292 SHA256 7544cea8763d24cf22bd002ef8e6ae76d7214c18bc68f9dc79490c4050df0e3c SHA512 321a408f62cc7384110f583a20c8b4190095d46e73713983eee98077092e6507f02af9dea4a4825d808598168df00b88eb188a3f98ad05a12d9abaa91f17644f WHIRLPOOL d43523acec80c94074bc27135f7a6fc629e654f721ca9c6da155cb8db3db385284bd30425ea01c140107881c728544cb319bb46848fa2841383e25fb265ab6c0
--- a/dev-python/chardet/chardet-2.3.0-r1.ebuild
+++ b/dev-python/chardet/chardet-2.3.0-r1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
--- a/dev-python/chardet/chardet-2.3.0.ebuild
+++ b/dev-python/chardet/chardet-2.3.0.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@ -6,7 +6,6 @@ DIST click-5.1.tar.gz 275592 SHA256 678c98275431fad324275dec63791e4a17558b40e5a1
 EBUILD click-2.0.ebuild 658 SHA256 b99c018f3994229c1ae0783351f08828de3ab929805652105704f4913d308f8a SHA512 0aca887ce4c865fa3406b4cfe069bf152355779b314ce7f18d9a63aa3173a35115a45d1acae4418a274984cc29728b283f6a6ccb25f4bce630e64b7c1cb5c962 WHIRLPOOL 0eb9612e3db058f76fdbaf7d156b978a33e02c8aca59996041abaa2bb91ef6e75ad1c18027acab49a0cf541655c9d16d0433bebcfc2a56c1672a102960b71fa4
 EBUILD click-4.0-r1.ebuild 1053 SHA256 18a788c76f896b6a2e382089fb5fb29880c55302ba1abc8e6214cb768f9bcd3a SHA512 2a31a844a286d732ea9454f79c426efba4d350f68bf56af34c06f01569e30a34b4864d9ab620a0e175a91d2fd14d842c0297cd5ab2a72a728a495934fa88a2c8 WHIRLPOOL c5b456869aa3d54b2517f54b25a7c3b0818ab458fa8767f8b48102c8f270be98c141d11d345daf2f2e6b9319d507bc705a0c49d7308a8d0af5db0437bc42d29e
 EBUILD click-4.1.ebuild 1014 SHA256 72eef37f04647f842ebfd34a30a2ea0599fbeeb20d25b03f655f7ad0ed2502a1 SHA512 860892dfb7aa54a7eb0a57f4c5b0533e48090e97fc1915c1b04b035424c880c75a4ac60c299cac6ef2d816bc78891539ad62d486ad0f19c53f98249ead2809ed WHIRLPOOL 61ee6d39870c5496b13aa42264dee9c3193ff58659ef2f904ddb00250b3af52928b6e3b3ccf2f6f394b75f12d34197a07e240c66481c43a7349246e52e4565ff
-EBUILD click-5.1-r1.ebuild 1016 SHA256 67b862df01143cbdc10d38fba872c11c1e12c5fbd2dbad3c35623fab6f29f34f SHA512 70ebee3584f40fb959e00e36b007fabb88bed9bc802e28cc5b2c74ae5e24e7e7b12e24e642e190322529527651b5f4322ead5443d31a65bdbf8a3c5c4fb311d0 WHIRLPOOL de04ce6c708d56b285a66358e8771ac4e29f6d0585f1660e1209c34279dab3c158f9a4fc79703d8814af7d064c8c03164f101d1443b758ad3bb5c424c8e8c93d
-EBUILD click-5.1.ebuild 1008 SHA256 95eb81c7985f8c462b8abb39f44b5c5f93475148a542f7ce2d86e90b42d966bd SHA512 9b10659896b67c5713d9e9a6d14ca8212dffa6b86e9817bd3e4ff670cf89371f485384b4396faf87468d236d92bd3703a98dc0405b8b8c149816ec4fd1d3fd03 WHIRLPOOL 0322dbbc37bdf79f9b00e73c44ade6f0a3625ef68b77bc2cada2c46a1869baa624c388fc27061752a4eb7acd0381e702f3465afbe544de463f4d33aaf3feadde
+EBUILD click-5.1.ebuild 1088 SHA256 08032dd32121e0239c0f98436a72fce7d72cdf23190ab1467a07904be79c8525 SHA512 562f9607c0d9146eb364e88c698e28c9fbee6a61a9433bfecee8864b7c1d3d2d51324b6da8c72207b32dd17f425b52fe90b2867762680762de58642576ba29bc WHIRLPOOL 87b6e0ed3c5be7f187b9b20e266396568ff78e4a76edce1dfd45e081dedf675f94c2aab57339afe21592994616a0e857a48236b49e2a328c19811deedaa35668
 MISC ChangeLog 2454 SHA256 8e8b700763da2a86efa78490d2cfa400c822455a26a0be9325f7f831dc20ff33 SHA512 8cd0b1cb292676f013bf614c93a2f165402e481630fec94dbaf5488cc3fae1ccfbf0cad485ad10ec11ff0b19f27a8fbab67eb311bf1aaa4a3b98a655459deef2 WHIRLPOOL 03c10ff8974fa6ad444d9ab4de78e57a4631687a97da9ffeea9e85ad2cee6b4660795cba5dbffc7abd6915e4712192e3e8129530e44718bed8c468b7bc079a90
 MISC metadata.xml 228 SHA256 3fa918c866e06e5f06d7c83c0292001911f59df4687da67e11e9eccbbe8c0037 SHA512 9961f824bb904d7ca99065d6df54d4e8f1b4c75099c40883b799eabc5cc2765a6b2fa2d88f1ec9fa3aa46f874f76f0b019446a55f249eb0a9b14ee89831a889e WHIRLPOOL be665b1155c03a4cf4a60ff689af695416913015ad3ec3bc78bc89310d747bc103687b354754af44533a86d407a24d03e75bd7d06b40cc5ff2e5dee1354ec7f9
--- a/dev-python/click/click-5.1-r1.ebuild
+++ b/dev-python/click/click-5.1-r1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/click/click-5.1.ebuild
+++ b/dev-python/click/click-5.1.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -14,10 +14,11 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc examples test"

-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"

--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@ -1,7 +1,6 @@
 DIST colorama-0.3.2.tar.gz 18343 SHA256 218862857d74ff781c2caf44629a7d72b88bbb8a2b0aa0f4f1eb8666f8305c11 SHA512 1fe6d72a4f56ef1adb96f70b1721223937647a2f22648bececf7ad05710d82bede767ebd00e9267db0f874ddbe3ec852b82408794b80ea803c888dcfcd9b9532 WHIRLPOOL b49b276772798ba0b606f0b109d8eef1aaeaa6103e143765f75c3c9275b5e94a06aefd05856e0534372fcf0e3da10b236eac8f1f0b4962ec297beff0cfafe059
 DIST colorama-0.3.3.tar.gz 22765 SHA256 eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c SHA512 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495 WHIRLPOOL e5fe6c0046b558abdde260d9d89e3cbe197165f99fb4f7134c14fff95e6c1e92b3472a95001d847ab58e8445c87f21774a71f629771593934ea070838c765461
 EBUILD colorama-0.3.2.ebuild 584 SHA256 ab9c581bf041f7a516cfe3b6b83739dfeac8b6444e03f4a36b84389dbe09b90f SHA512 568a75ee7f17d6995762f623e533de6a7e1b280d965991db8187580bfea78f1f3cefc33957716d0de24d206e334bf5d3e5cc4305c48d4210c4729a85641d1616 WHIRLPOOL 6c747e9ebee1b0b35742c5a8f4c0273594c525d6a6728a78fba90b85ea146f9cd83857cd0944a197a80c4b14dc98831c26fb533be73c4601a7594afa9f122201
-EBUILD colorama-0.3.3-r1.ebuild 673 SHA256 2a0a8aa463fed4d97f1338fe206d9c809fe77afe13bb8ac0bc0353b057f1a02a SHA512 01c4d0492d3f9a6bdc14f1168a2126931a7afc692ba4f7aed07dfa982a76abc827d201a86a77742a7f22ed11fac696f81d8851d5ebf8e56e24ee56ff37fe2438 WHIRLPOOL 088879f00c3226d979b18500cd7eb065b5b60dc78bd9c607e3b6c5be977bd8230f17c59bb25a3a8433fdee731b667235c4d254d9f77b6e149a773802074a67c6
-EBUILD colorama-0.3.3.ebuild 704 SHA256 320161ff5576ac0d90d4aac71461c87ae9ea15447fc8cf739a480f0327479b8f SHA512 c8ccf24708d047da7f98064d0c9d49c7b11c14cb47fb10d56c6761c47030ab7a23d957aa9aacd4cbf85c9351b23b6d70eb2ed079716a683431ec58840ccaa958 WHIRLPOOL a0da5257eddfb84ce72fe460febd8fe78a51c0b5b2f54a14d5a4b46c10ee4e719477fec42617cecca4c8374de78c668fad4acdc4760d8868fb336680d8481bdf
+EBUILD colorama-0.3.3.ebuild 745 SHA256 05d1759f13b27de3f48029b38172d29beca8b66eca603ec70cf443474f5fc333 SHA512 b008daee33a6ff4b1a11145abb28489a436f2de1f3196c8a98f7e1b47f6ce04a9c4dd292d6319ce0152dca810aa755844ba386f68a18f2827ee57d5cadff911b WHIRLPOOL 7cf9d4a4eb8143c8b7decf48c20311ef17414e8eba00eaa18d050a653ff8feef896fa34ddfcb4e6edff7d6f4a4c6c42c3d0309d90813be230e94806552c24dac
 MISC ChangeLog 2536 SHA256 14308186bf4ffdd545192184a2ecba3c9367cce4e2a1f88d84646a7cf4f7103d SHA512 a67d9a6e45c5fc9bf8cf5d73574cf2984a3efc6409c978e5f885eefbcc21f4d9c97bb16350bebf776d6c0c93a46c29319f464a6eea2b1d5d58a8f20a44e27cdd WHIRLPOOL 53d7d993cf77b4b69d82d41289cbbe4d7d93e793bef0e2007ab9e9cf145a70fad70d1e12a6635ee192e22377bfce932c9870e10fdd8090590083a9e4f8380dc9
 MISC metadata.xml 583 SHA256 c2e512a662e69b8ff954d81bd999a970660a825b78b6b374458b149456814e7a SHA512 e9f3871b647f9dc0ab4d80c43d38709e83cd72ca2c14d6efe64cad2b8f63a8f652e675c36e6e4d493e2aa7ba53bd0d36054b209254395e4c88a0177674fd3208 WHIRLPOOL 08665bfaa36f15b184d60302b834b96e5b05930226a5d1619cc5378e87c4282a172e45da56b40b3433f78480b151bc07f096e4519f082412fd52fed421fef572
--- a/dev-python/colorama/colorama-0.3.3-r1.ebuild
+++ b/dev-python/colorama/colorama-0.3.3-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Makes ANSI escape character sequences for producing colored terminal text & cursor positioning"
-HOMEPAGE="https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_install_all() {
-	use examples && local EXAMPLES=( demos/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@ -3,7 +3,8 @@
 # $Id$

 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"

 python_install_all() {
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@ -1,6 +1,6 @@
 DIST cov-core-1.15.0.tar.gz 5890 SHA256 4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16 WHIRLPOOL 8a4198b8914507aeeb44c66ece4397c98c86cb7a5206d5b69cfea34bda2399f6c37ad46935839a86edadafecbf534dbe8a275801f9b217e994576f399f0a884a
 DIST cov-core-1.7.tar.gz 5972 SHA256 8050c226fa73234b88e62630d64e0416c879202891309cbcdbb8b556222c3020 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140 WHIRLPOOL cb85a234560bae9628853958a88e15abb85a570710fdfaf627b1a3c0242bf3d6b46bdecd14972744df5331d884c1b592266143f4ececa0b795fb4a682d1156a6
-EBUILD cov-core-1.15.0.ebuild 612 SHA256 b7087fe24666380d65f2787ef9289db0e9b5bfdce5f5b4f8e4dc09bafdd5a1ad SHA512 8499c8493161354226a8c7d25eaf3673612870ee8a16c28afa61eb7aafbff7625c53bba7128bb29eed5fa704f54a58707536af88044d98f1abc79d50fe2f8b7e WHIRLPOOL a8f5a2b46997c28ee200e0064c342b13efa1bfb33e585d5c9398d20b7109d27914c76f5aa74d302fb20ccf3e6cb3b7d57e257571e95974225b98cbe1b224694f
+EBUILD cov-core-1.15.0.ebuild 616 SHA256 b83ae759b6aaf7c3d8d53a79e5bf6205f5034999228327fc499fac49d99d2067 SHA512 ef1a183c1252009aba161091c00e82dccef3526bc46d3bac5f0d24021069b4d15540d23dc05ac5be2f63c15e5b1d7bf711d1892b8f870be85fb5240f8abf86f7 WHIRLPOOL d2ccdf23621784b6b49a4e9240f069910e5d2b8b048ef7488c0b9ea6882c48b373f38bfd2b9b06dafa7c95bf2bb83f9e6443c134352d58e5ed9d4c4f86f2a805
 EBUILD cov-core-1.7.ebuild 550 SHA256 bdcf63da87cdc98d1d65b386e2e9529e822d3a9095171c261a4013a92853d29a SHA512 df1b5f778721cdeeeb4fda2503a9638bb825f6c791a78e35d8a45dcdcddf18892a13451bbd8c67d7660e0054efae7149bafb65c7e2f10c4d20bda7b3821f6c0a WHIRLPOOL 24c68ef4d8e73bb03f28c1cdb9b1d8ced0b13b69b2bf3c93f34a6a281885d97fb7e13c61b09c3512f679f523758f02b8e17c60bcdcd107aa97adc61b991676ea
 MISC ChangeLog 2448 SHA256 0277f2c827a8d34d17e3b064d447cd086a475692875ace2b89091432fcbebd65 SHA512 abd2102c4affada7f12c40b2e7bda01fa3697b71f33dc93a1e17b65793876dc8ba3cde1756f98bc46733b3157b14028b510316e3763221645611d28954ed3106 WHIRLPOOL 6422c2d913c2300eeb34a5a736f5c997e156109abde4fdf6b7b5083e2ab9d6b55488f8dd87dbac1715f4025f75d909a33b714b49c1064aa7273c4a319eef671e
 MISC metadata.xml 379 SHA256 ce350ffe38afe575058ad2ad729a2b24d239324a2427b7118bd2df1e59b309da SHA512 98c701503874dbfb75eb9b19a55fe6ddc04c5753f43a289335a1626c3bc9d657e0bbbb2aeb0c77e2755a1311bafb849667a8785b079a8e37c71c79443574a38c WHIRLPOOL dbce2b573bbca89625ccb121a656c84aae0e1e292899397185ed32b7b4ccad81a843bfff38af7559156f84e22b4dc5130c093e7b993fb7e6c1b0bb9aa4a4bfa2
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
 inherit distutils-r1

 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@ -5,7 +5,6 @@ DIST coverage-4.0.tar.gz 166399 SHA256 b1244343e39cb2835f9c89c2d8fbcad8e4a5b4945
 EBUILD coverage-3.6.ebuild 797 SHA256 adccfda9d832648453ddbe8937e4389726a2910b2cf2499b05d8282773e03415 SHA512 e06ce886e3fe35a0c30be6377fe56a7d3492c10e12497f71f8b4eb1c48dd62997fb1f754c5b9ca2bd1438f82ddf20612eb6a824ba3e1f5b701d592ffcbce5a8e WHIRLPOOL ca5f07c3eedc730f1421ce99cc77c053776714157a56242f29dc27c7b2003115c4121e89126196db30f15abccfc0afd47db5ed696fc8b7be881260f7a0aeba9d
 EBUILD coverage-3.7.1.ebuild 867 SHA256 50735f7d310b9f06e656e6d85dfda7b2a05c70d61db87a18972efec8d88456a2 SHA512 51cd5f261750844f19a0fdc08ef82e19e875e9ab31ad76b5b64c066582bd92d5d45fac6f97fc7ff85efe17cdbff0c028871457baa0093b89610b0dae6f70c49d WHIRLPOOL 1441668eba62c0035fe67ceff4afc45cda1388d0acd8ab29677411ab2eb30d5448ea72d427489e46564011f5ed7385b6050c3f602adbac845d6606bb3272a4cb
 EBUILD coverage-3.7.ebuild 809 SHA256 43495de93d358d8cb25dd96c95a8922c85507209b62ce406dcddb2f0e57bc18f SHA512 b31e178c9f3eb9dfab5ca58d27407489279f9b4dc8fee51ef98ce8b7805e1f7bf156804d65a9dc88bbb092e397047971c74360e63045734a1603885712c82b33 WHIRLPOOL 6a31a32decabcbf4eb7b9b99a428683ebcc2aaf3c5179c02684d336f4889742be9eabd5cc60ea2625378ce2cecee7f3a1c72ef7965721023f9df231eeafcd1f8
-EBUILD coverage-4.0-r1.ebuild 815 SHA256 9a5d8d33071a0938253a58812082dbc813e9c06bfbbabf7760aa3b638e5350be SHA512 23f38797cb966c513e3d262f6c39d28cb685203947901b3ff23f3017ee7dbd4aed8dd2a308db2aa1d67f0ff750fd4761bd26083f74555e6a7f26af733cd80857 WHIRLPOOL c51911d916c22aadbb796d7f9eaeb61532cb454363c999db65d21dd7a95bdc4975501976289c0c837b54ed3c6d9e7220d608f30c8fd2fb5d6626a15c451f728b
-EBUILD coverage-4.0.ebuild 880 SHA256 8457594ca0267c1d66c16bca27e8e54b886a83bf51f56b7e8de75e5500d0d9eb SHA512 3e450a48d6651c19ed32a133d84c56ca8c7f611ab004ba8c97c0c7a1cf53bd465b6145d1b7ce14b2235be2bda4bccef8e24ef361ea24aa2661c26a77df0881cf WHIRLPOOL a7ec9830178a38f002ef15780037759fd407a9b5585414f8352107bccf24a62dfb487d7d87689a57935c5e7f70bb2b7ea44c703a8ab5afd9ab5592d5ff19c1aa
+EBUILD coverage-4.0.ebuild 887 SHA256 97ecb9143166b3fdd1a4a6e6d83a32b69e4aee19c07c53b967d3c6b48bc88e39 SHA512 81fb44e4b48f589dfaf22455ad558c5800de32e2e98197e9d1f71bcb3e612e8c3977772ef8a4ffb67d25e1def4ece11298c8907cee7bbef5648bd1b2e8e26803 WHIRLPOOL 4428094b1185ae936cf0092100602190c53118c88e89b3dfe944f4585a1fe95c019a17c34079d13c7b65e57afb2664de160d172d3e9dc5f98460555e3e8ce5aa
 MISC ChangeLog 14655 SHA256 c31d8e2d7443a6a993a269bc8d6742f2b4c392cc3cf60db9c9faf88f02fa8ca0 SHA512 c1a084e5dbf8ab2dbc264922cab9eb120047e907147e9398ce56659fde8dfc5ec19689018b389bc9114011ca7e3bd47d2b3f1fdcd218b37abd9ae06768180967 WHIRLPOOL e7d98df8e69d15175eaeeddaacab3308d40132a13bbb364c213c59f55f0b9849e21edeccb5be9f7a56ab7728c4c19c81289b6cdb0b41669539c4c295c339f1d4
 MISC metadata.xml 619 SHA256 2a6bf8023df99e2634e3bfcb477e464bfaab6472a1d759ccc488342da1e92fcc SHA512 c873d2defb187db5d3721f17bafb86ed2254e656cdb46cae345d09a09b4a042010b128f88e338840aba055698782deb726813a02d8cbfb318dc32edac7cf16ee WHIRLPOOL 1525f111bd7e78f662bc0f9bb2b78440fb799ba13ce9827dfe5a5b905970b407d3c9c318843d59ce9575efaccd59821e0f90e4793ba47910a68ad1f057466b0f
--- a/dev-python/coverage/coverage-4.0-r1.ebuild
+++ b/dev-python/coverage/coverage-4.0-r1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
--- a/dev-python/coverage/coverage-4.0.ebuild
+++ b/dev-python/coverage/coverage-4.0.ebuild
@ -4,7 +4,8 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
 inherit distutils-r1

 DESCRIPTION="Code coverage measurement for Python"
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@ -19,15 +19,14 @@ EBUILD cryptography-vectors-0.7.1.ebuild 616 SHA256 3ad74699c24a43ba4b172999e109
 EBUILD cryptography-vectors-0.7.2.ebuild 616 SHA256 3ad74699c24a43ba4b172999e109121d13070fbd12a4036c661bcf2f3c4f00f7 SHA512 1a8fbd5e792f8b53e1261abd3809ca5c791dc9af6a85c85b5d04b70be89b7aaf33b4e9822a0a1926e6faaf29b6d6f4a44ab5d9952f1e7c94bccc485b22e32938 WHIRLPOOL 6ee89f2b12deaec94ad239adfce2cb7d4d0170599d0262aa343b26abc8ba7f323236792844dc623bf16a06ceb76b45c6b5a82fffdc619ffe84e6e68a358a72cf
 EBUILD cryptography-vectors-0.7.ebuild 616 SHA256 3ad74699c24a43ba4b172999e109121d13070fbd12a4036c661bcf2f3c4f00f7 SHA512 1a8fbd5e792f8b53e1261abd3809ca5c791dc9af6a85c85b5d04b70be89b7aaf33b4e9822a0a1926e6faaf29b6d6f4a44ab5d9952f1e7c94bccc485b22e32938 WHIRLPOOL 6ee89f2b12deaec94ad239adfce2cb7d4d0170599d0262aa343b26abc8ba7f323236792844dc623bf16a06ceb76b45c6b5a82fffdc619ffe84e6e68a358a72cf
 EBUILD cryptography-vectors-0.8.1.ebuild 616 SHA256 3ad74699c24a43ba4b172999e109121d13070fbd12a4036c661bcf2f3c4f00f7 SHA512 1a8fbd5e792f8b53e1261abd3809ca5c791dc9af6a85c85b5d04b70be89b7aaf33b4e9822a0a1926e6faaf29b6d6f4a44ab5d9952f1e7c94bccc485b22e32938 WHIRLPOOL 6ee89f2b12deaec94ad239adfce2cb7d4d0170599d0262aa343b26abc8ba7f323236792844dc623bf16a06ceb76b45c6b5a82fffdc619ffe84e6e68a358a72cf
-EBUILD cryptography-vectors-0.8.2.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
+EBUILD cryptography-vectors-0.8.2.ebuild 642 SHA256 dee603d02724b2778e466a791fe6064a10371c5b0de0a15a9f470cd14a36e008 SHA512 9b0842f94c08d1c7cedc496e91a9495eef5901fe23b114b46d93f30b94636bad1419de18c6c6edfb7c32e9aac9bbc5bdb5d3fd3b87b6770146297e48004125eb WHIRLPOOL f9306eb09daff6c4035ba8fb4da323172634517055f605079574e94ed18f49d63ee1bf127a25c65e823e75aada0ca199d708793482809fa610ec37cec0245613
 EBUILD cryptography-vectors-0.8.ebuild 616 SHA256 3ad74699c24a43ba4b172999e109121d13070fbd12a4036c661bcf2f3c4f00f7 SHA512 1a8fbd5e792f8b53e1261abd3809ca5c791dc9af6a85c85b5d04b70be89b7aaf33b4e9822a0a1926e6faaf29b6d6f4a44ab5d9952f1e7c94bccc485b22e32938 WHIRLPOOL 6ee89f2b12deaec94ad239adfce2cb7d4d0170599d0262aa343b26abc8ba7f323236792844dc623bf16a06ceb76b45c6b5a82fffdc619ffe84e6e68a358a72cf
 EBUILD cryptography-vectors-0.9.1.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
 EBUILD cryptography-vectors-0.9.2.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
 EBUILD cryptography-vectors-0.9.3.ebuild 638 SHA256 c6878198602d86c21a30135dce422862bb02e95049b97a5382f20450ea424d87 SHA512 a4c4b0126d948be15aabb7b5b0c1695735d8d558cf6f98543f248c86b39ea324703161c7bae137568338c52416f8db8e01658f13b1284f52a745f098ef14b460 WHIRLPOOL 8d8490b5b9b58e73fc01df43b3ef2113275fc4282aaf3e06013a5fa6a60dc75df262a38f5fdfe26c706c4b0c5eae36e6e9a355a82ceacf2008e6d8c097b3201b
 EBUILD cryptography-vectors-0.9.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
 EBUILD cryptography-vectors-1.0.1.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
-EBUILD cryptography-vectors-1.0.2-r1.ebuild 577 SHA256 128c1f0b9763e1329972785b0e204e32e314e1889446ece4785b7906656d9f38 SHA512 41096127de4f55b8b8d534d54d62e1d24a3d9a224bb186020d0fff27738dc9937b108fd2ae432f069c69b31b0af6dcb670f9b8b8dfdc8eae256c2a6a0916adb5 WHIRLPOOL 00b7ab0825a953b060b11591af00176d4647c024583e350721aff85aa0686ef17d1a2c8e12db2af593a8c7ffad6d627ac37dccfa750fd42fb7dd32cfc4ce8cae
-EBUILD cryptography-vectors-1.0.2.ebuild 635 SHA256 d691dfb3ab1624db8b42a00e8c22dcbdc767231adb80266944fe8dbb751d18af SHA512 e44c38ca247b899e4b5b5139bf21a2705c60a6cd21c59a7e723c9cae065a4677790c3fa2b713a91e0ab17edcfda0f087a399f1c0094b2d72b91888014560cc82 WHIRLPOOL dcfc039b1ee1212797426427b1cca4f00d56dcd0f917b263f74c9737198dff095f1835525cd8c50f90ee54c59ced3610bad9cb9fb376d1f2953408500f5019d6
+EBUILD cryptography-vectors-1.0.2.ebuild 644 SHA256 7cade00533d1e93a69dd09cf76b1b749c350e8abdc76ae825e941776eba2bed9 SHA512 47f2768124e1e50f45264251e3065b6a700fc23e6ad74ef5535240409c81555e8954477d30d14b3e2a3aea26e23a27a185b3de690a553f861caafeffe3fcdefd WHIRLPOOL 54829fca72253ed4d09e1fc8927df0151021c970223e8507d0a0cc0d1dc2c6400ea12cf62e8f37be80b737dad4587f756ee66b3c3cfe959a466c86e4a5916978
 EBUILD cryptography-vectors-1.0.ebuild 640 SHA256 eab3683f1e7f01a87b48b0f76cfd8295ec14738ecba5375085e664e1ca7b503d SHA512 2129c2319499461442d4643a0de230ca24b5560b4dafe5d37e435c05fef8b2a75f35dedf71661878966beacd5e8a1478342c0d7b64ca36ed5df801b12bc31fc8 WHIRLPOOL 1c9df732e9ca4e02806efeb7f708160c08c3190246de230e762acc31ddea56d3371a1be42b615736d68d4463a8ff2ecf679257eb0b06e9426306b2985b1abc0b
 MISC ChangeLog 5384 SHA256 7e6854358fbe448569b7ef469923057f58b6fa344e315581578f0e209422be36 SHA512 c727701a17221d31216b7e8f3f83349f778630571ec8807c4da9e5a9daa611fbdc932ce94566bdf2c45879158b26201f3d03ae5bd5a806c4f153f387f9d0e719 WHIRLPOOL 1e5323c11ada642b1e86995b5b5b53d8aac94355ca2df42e3b97b56ac0077f7ea6696d66ce19c7c0eacc6690295883438ac673c21d70cb2a288f8c7e07c325d5
 MISC metadata.xml 248 SHA256 e43b2f52a79639462fc4d92ce34c8d7d7c3b19a0416fe5ef0708bcd81460fdb8 SHA512 22bd49cc127e4abf48c2ad4a6f1675f989619c9ad87bd3e2601692088dc56481f8dfc6a406ca73b8d644e6281e2fc66109d8365d197ae8c1303652d2e31ab6e7 WHIRLPOOL d0f6463c35d68fe1cb3727bc3ae27fbec6c4e7aa22d2059f43915b2f1974b904e906b22241a469f5bad6987502b871ba18f60f06f3c6d0e667b78528f35a34e0
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.8.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.8.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@ -16,14 +16,13 @@ EBUILD cryptography-0.6.1.ebuild 1293 SHA256 685c337f9b773a3c64f4eb446ea761a3b15
 EBUILD cryptography-0.7.1-r1.ebuild 1349 SHA256 b7d24e4d9581b35286b15f5e96127f0a5f145812acec1123b755740c8206782b SHA512 85eec2196c2aa98fb69f9d4b37ae1cd45a351c62d6fa7801da8b09cbe75f5c88774b6b2942c2efee99184e302f699db9de7906eb5da50f967f0d7bf7297c160d WHIRLPOOL 795060f1c701ee38b03e310eb6624cccf37124fee680be28baf67ccdd49e75a2203957562a1ef1f776bddfbfbd6cc56eb8432defa083e3a235b493db06fe1fe1
 EBUILD cryptography-0.7.2.ebuild 1306 SHA256 2e16b8033b0cfe810799349c70af059b07e0fe7e5ceaf0715be761b20a52fe74 SHA512 6783cb0dfbb691e216976587da9917e08602882546f80431326043bce92349a820cdf2b0170bd843d8470c80efc94e2378801bfc6446ada1e7e7ac0ee5da3cfd WHIRLPOOL 4ddc30637ad84370e7e4756e11264dbfdfe4b706d9b41d8a9076449af80cbb3a389e3a27a210dac78988782a4dcaedef2eaa6a1d706d7fbc174607d307e95c82
 EBUILD cryptography-0.8.1.ebuild 1313 SHA256 ac47d662485a998fcdf95a6c9bb48a5fd23cbacb2ef6dc34dbf59d94daa102c6 SHA512 bda15ad07bc7e658ca326be42c5b22d17d723ccdc37beb116113b5e98308ccc64498d2dbbeca29ac531fa26d8655dc79330c10adb6fb2a5fd8df5fea8f03ecf8 WHIRLPOOL 3336ff347cc26482eea97bb245626554ccdff01b3d2e09febaf9114839952a4da0c30c5b97ae04957728222fbe61d47822f4ac069be5be556692e19b428941f9
-EBUILD cryptography-0.8.2.ebuild 1318 SHA256 9822feea1749dc7560b109637f2e653fc2ce441e42ff47588835ae227003ac46 SHA512 2e8404d98dad673f21114814e82e4ed47f002ff00c28ac770db3942035eccabd02b366205fcbc33fde810f8717fd26d986d5e6d869e065733b213f6888659786 WHIRLPOOL 8685754679ada0187528f94aac02a7f8bb1b5530c499d137a8e0e92b2eda33b43a4d00004a0863a88cbe2937aa90ef294c6a1a09144be308de247333fa51d814
+EBUILD cryptography-0.8.2.ebuild 1320 SHA256 3191dbc2ff0b6ca34973bd3a1f954f1907126bebf1f75a08ba4931a659255439 SHA512 88966916a8ee742d13d90a1e39a259b63f689d84a98969acb2f12847bc743464b79f581968ed12bd59d2c987c21ff6a4fcfce4da909e1d6d0cf7b9c5db88d004 WHIRLPOOL a340930e04d26c22d0395c9aa780186f6894585f6bdf37c95119669bcc68b7aac6acf280953c9dffb218f817065ab975dbe600b12614402ce194c661b6680482
 EBUILD cryptography-0.8.ebuild 1306 SHA256 2e16b8033b0cfe810799349c70af059b07e0fe7e5ceaf0715be761b20a52fe74 SHA512 6783cb0dfbb691e216976587da9917e08602882546f80431326043bce92349a820cdf2b0170bd843d8470c80efc94e2378801bfc6446ada1e7e7ac0ee5da3cfd WHIRLPOOL 4ddc30637ad84370e7e4756e11264dbfdfe4b706d9b41d8a9076449af80cbb3a389e3a27a210dac78988782a4dcaedef2eaa6a1d706d7fbc174607d307e95c82
 EBUILD cryptography-0.9.2.ebuild 1332 SHA256 546e433ea46758ff6b720286048f94c228bb9537e0f240e2acf306b71be93394 SHA512 b00146286cdb7a7bed7643f1b65208da43ca5705d5ddfb584b3b9f108432cdcd651049e0e224555351829466da319dff52593e90d6853c93328f941e9a2f865a WHIRLPOOL 0c79c22d23c74e2b055395008b65b59f0ee4e49217ebae99043d11c8afd7081ddd2ec6c097406924ff71ddb9c78db661d77899e494f2f93ba758268817e71d62
 EBUILD cryptography-0.9.3.ebuild 1337 SHA256 b178fbcfbdda4b0c9cb8e695335d19fe9f00ff9f72a2db0c7d6cfbc1940353e8 SHA512 1789a68f53071d89b3a26fa4fd10d2cb8fe1489dab0c2cb516b10a8b0262bc2205f5fbc1bfb97db2f357859159d2b9f31d845bd5bb5c2b22b4c1f4c46bd14567 WHIRLPOOL 59b232c05efc713a23463131f3cc656df27afb32327ca976ab301cfe279407bc14c654be99a59a942f5d07ef71d6d49aeb125c8aa3393fc96876b412081ea8db
 EBUILD cryptography-1.0.1-r1.ebuild 1487 SHA256 53278a1deb80ba0f039ef909a5f3e633c233e21cd991583e9e1606693ae52ffb SHA512 2dace616998648c2f4045ec913af334a9224c0195e1be7e1f333a911b57493beaa96138e84798c3165abba7daa3305960fc2f11920d8a8d907c40ae42985dcbb WHIRLPOOL 80ea6bebd707555222e2edfb9eb9ca481af90c4c4f191852ee0b3ff82157d85ea6790a3c835062b62715cb1250aba71980230934ae1b7b8c178e254acbdf28e2
 EBUILD cryptography-1.0.1.ebuild 1430 SHA256 bc1788f8313118045cce596a89757e1c3820b5200436fd9cee49c9a11757b7a1 SHA512 d655c5d8c301d778c242e4386f6b9564bad2730506d4b93d736df7a1ad74d8ae904bfc840e345f523c6667f8b52cf8c7862c8ed15113866b07a27d0b28b5e496 WHIRLPOOL a6aa7f5f5ef0ddca11341f40945a830213f2ef79d7cba2171b5a86ccdfc19c38b51a317ecddf98a7841cf25a9b06e86cc5a87761ca95c77f522ddf7dfe6b4ca0
-EBUILD cryptography-1.0.2-r1.ebuild 1520 SHA256 7235dfd3cd1de0b9a1930130cb360241d49b9b5296ed088b36646bf3522b2db2 SHA512 2d25f7c943684541e31412eb75b7c86530a59a2e0da0bf5fb1e144d40367cdedc2fc412741fb13b4907f83ae9c6326b385b2b9dd8da8ca003b4d6fa2fd7d9071 WHIRLPOOL 91db689e52e134bce0fd815c617cb916ea09a2389c60df9d15d413bf362c276b173acf0b7eb1a05bfb63199666ba9d4f1053ae1b7604359b69cee3ca01c22d3f
-EBUILD cryptography-1.0.2.ebuild 1538 SHA256 c4b37bb4719763bdb6bd456ad6ffed9c40d6a58b5ec8f1050297ea4e20405b97 SHA512 b80f0337166a42a787c466729723b626c1a37afd66fadd180be7f5ea59deb38815d0efe90c7a832dcbd6c92ed7cdd9f34b10df107d05dcedabf0d5426bd172fb WHIRLPOOL 676708c29f527c1723994803a26be16889a0b9b0c75ae894d4e82cb8f4402346fc744c36ad16fff5755e5348a5ab9b8cd667cfde3691f175f766810db25548ce
+EBUILD cryptography-1.0.2.ebuild 1580 SHA256 a1a72dc2075ad6ce74397a6fdc6af398d712c1f999b5f02937025ab6dea81800 SHA512 337f1b32ae4e0a658250479cc848912c88e4617210436ae9074eba74994293bc6b13d29f0fe30bf1cbc79e35324a57679b2c115eb2b60dafad53496f3a2d89d1 WHIRLPOOL 31427890362273326b7c240152c889f2b555cba0c208e86584e2d25ca0c04d85faaadaa8b9a86bd5d2d065de44318f866b5a672ec6d6d476ad77c685ac0f9b45
 EBUILD cryptography-1.0.ebuild 1430 SHA256 bc1788f8313118045cce596a89757e1c3820b5200436fd9cee49c9a11757b7a1 SHA512 d655c5d8c301d778c242e4386f6b9564bad2730506d4b93d736df7a1ad74d8ae904bfc840e345f523c6667f8b52cf8c7862c8ed15113866b07a27d0b28b5e496 WHIRLPOOL a6aa7f5f5ef0ddca11341f40945a830213f2ef79d7cba2171b5a86ccdfc19c38b51a317ecddf98a7841cf25a9b06e86cc5a87761ca95c77f522ddf7dfe6b4ca0
 MISC ChangeLog 8237 SHA256 c22eb0f4c94dd39980a8ce9b7d3b7149bc4ce59a7496f87c7e34951715c94e4a SHA512 b11fd6ecb95dd1265087e007ead9245b577ae76591343ed8f9bbf7c730344f0f31e3562edb87768a4a4dc3ab78a982b31bcbdae52b0060f805a7c4d0d64ec798 WHIRLPOOL 5e148ed158f1a68f8c1580c0ed5ccd3b50a6c88ce2a6228c80f5354eac95f8cfbf31ea6c2e2cc65633b1ef7332eb181efac8eaeb1a954a3004b081b3ed162286
 MISC metadata.xml 299 SHA256 5e418469afcbbeb4c5fe13bbd314b4837450129be530e8bdcc1235055a93d6c1 SHA512 9c6f8f915d5eb09e69105a30c50b44c3a45f85c9ed7a638417b6ed45ed1306f92f6538b06c95f8f89a6e1884cec805966d1c1e455321f5aa910a4cb983ed658e WHIRLPOOL 8d970e0ec8a8c05067809272ab32adb11cfe5acb2570cae1ae51d0e41ae8e39108f101b8441da53a007843291b811bdf8d33bc710fec29f9f295a8c52c50ca30
--- a/dev-python/cryptography/cryptography-0.8.2.ebuild
+++ b/dev-python/cryptography/cryptography-0.8.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )

 inherit distutils-r1

--- a/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-		<dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/cryptography/cryptography-1.0.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.2.ebuild
@ -5,7 +5,7 @@
 EAPI=5

 # only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )

 inherit distutils-r1

@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"

 RDEPEND="
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@ -4,8 +4,7 @@ DIST Cython-0.23.3.tar.gz 1628634 SHA256 590274ac8dbd1e62cc79d94eb2e2f4ae60cea91
 DIST Cython-0.23.4.tar.gz 1628326 SHA256 fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e SHA512 67f4d2be22def78318e8d3edc99b944c50291dc812064b0c8829dd453881bb288037087ee8472b161b9624ac13a50ece71a0d7560c9f2f7d94cc6fcad107e749 WHIRLPOOL f92dfc40080bb005bfdf220d8dc65c40b9ffa1e29b7c0c3e5c4e165f653f9b443af70191a3f7498777db07b9353147334d542e5e46109d4452f548d411d979dc
 EBUILD cython-0.22.ebuild 1768 SHA256 8303d8f35bee9242311a7aaa94bc428270a479892e67007a1e7cdcfcc7ec3d98 SHA512 bd90c2d4ce1c60a14a05f7ca614facc4bb1b74e801bd4ae7078a792cf04995a0975c6cb5f227c38da1c1a3f84b26ce58a1985e9dbcb1763634e76ff8da190e16 WHIRLPOOL a1eaa8a7183bc5eb89bdcf658811d3994677b73fb4db0c13a66d73e1df187bad0e5b26e964d2478a7b6233979aa92851cda58fffc9cb14af29b13b3dfee64355
 EBUILD cython-0.23.2.ebuild 1784 SHA256 0068015ff9914c4c5150cdb739be08b8c5e23a13d06a02fbe2263d95dce1efd6 SHA512 6bf77a573a7ac77a419b5a658be17a772bc11d3189bfcad71562171fa31e9dfb0db7b0aecbe4d5eeab168dcd243c20eda2057f5fc3691231dfb3d5d011ca810f WHIRLPOOL bef682ac874ecf32d47ad698489302b81c439b3c00b5edf00e86571cb87235e4c072779d88a893df7d187a0c05f28e81b450f5b19ff2dbe985b70a443c7bc5e7
-EBUILD cython-0.23.3-r1.ebuild 1720 SHA256 c0761324bbc0c235f67f637838da9f66b00261bd44c716cb131ff30793a6ae9e SHA512 e15edaeb018f1da402e93120802456bc29611b44a9ca19ea5ae1cc22cbba8533f27c9abfff3e9c404ee880fc4a079755028c05b77155ceb044fde8ddf4ea1ca6 WHIRLPOOL 91530afd968a9b501631256155279d6f5652debca78e2c7743b988265dcd4a1b369a7542457b8960426cf1f59158c9a39ba118b3991597ed9091bcc16b7c0542
-EBUILD cython-0.23.3.ebuild 1784 SHA256 0068015ff9914c4c5150cdb739be08b8c5e23a13d06a02fbe2263d95dce1efd6 SHA512 6bf77a573a7ac77a419b5a658be17a772bc11d3189bfcad71562171fa31e9dfb0db7b0aecbe4d5eeab168dcd243c20eda2057f5fc3691231dfb3d5d011ca810f WHIRLPOOL bef682ac874ecf32d47ad698489302b81c439b3c00b5edf00e86571cb87235e4c072779d88a893df7d187a0c05f28e81b450f5b19ff2dbe985b70a443c7bc5e7
-EBUILD cython-0.23.4.ebuild 1720 SHA256 c0761324bbc0c235f67f637838da9f66b00261bd44c716cb131ff30793a6ae9e SHA512 e15edaeb018f1da402e93120802456bc29611b44a9ca19ea5ae1cc22cbba8533f27c9abfff3e9c404ee880fc4a079755028c05b77155ceb044fde8ddf4ea1ca6 WHIRLPOOL 91530afd968a9b501631256155279d6f5652debca78e2c7743b988265dcd4a1b369a7542457b8960426cf1f59158c9a39ba118b3991597ed9091bcc16b7c0542
+EBUILD cython-0.23.3.ebuild 1786 SHA256 3ee959ef8e2a347096348093d329c98454db508b7747fa3ba9aa027229f1fac3 SHA512 d135292d4c34bd602dd8abe6b9316a901531892c1faeebe9a51cdffed92d80dbc4ea23d595eb218f41e267886fa276aedd8df7674d9af8de6a6450e7e8ace918 WHIRLPOOL 81cba4fa62a4e945a4fff9be412d8b1eb00a316ab61b149120a3a9c68852622fbe782a63d542c800e54ae1f865c289d872ef6ef07453b0d0923400f24865ab34
+EBUILD cython-0.23.4.ebuild 1786 SHA256 3ee959ef8e2a347096348093d329c98454db508b7747fa3ba9aa027229f1fac3 SHA512 d135292d4c34bd602dd8abe6b9316a901531892c1faeebe9a51cdffed92d80dbc4ea23d595eb218f41e267886fa276aedd8df7674d9af8de6a6450e7e8ace918 WHIRLPOOL 81cba4fa62a4e945a4fff9be412d8b1eb00a316ab61b149120a3a9c68852622fbe782a63d542c800e54ae1f865c289d872ef6ef07453b0d0923400f24865ab34
 MISC ChangeLog 20882 SHA256 b28001e470dd06b228c1b604f7208646eb6b1615c5a7bac34f09e48b6ae99efc SHA512 6aff62c5177687862bb877541960f6b4eb428f4124e7e21708f6919414488212b44c570c04ee650810ae113c884d0846c123363ecb4370bf3e69c2a77724266f WHIRLPOOL ea2177eedd40952fd53e2c8de10bb58cb7b19b44641cd357a212b75c06e4fd8228bc2b9d5c2ccf9fccb110de1aec33d7b3066c5a84e3eff2197fa931995ba64a
 MISC metadata.xml 413 SHA256 3fa4b401e71b4f60b65f7c53fc40a43a356252e45f5f347c86831e68c8caa465 SHA512 c8faba0fe09577803c49c5b83d441e4e2043967dac26394c1b2570b29cb806c4db339a646da7038acf7a7710d8c7d22a21bc6efe97b7321e2e1641a43b23aca9 WHIRLPOOL efe25320a63b078ec2bc3dcc17c84538132df8e640f649c5052e05a9e84068a28bef4e34afefe4f272991f10b2214b0d7afcbc1cb695c0422b16f29f67088744
--- a/dev-python/cython/cython-0.23.3-r1.ebuild
+++ b/dev-python/cython/cython-0.23.3-r1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=""
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( Demos/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cython/cython-0.23.3.ebuild
+++ b/dev-python/cython/cython-0.23.3.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )

 inherit distutils-r1 flag-o-matic toolchain-funcs

--- a/dev-python/cython/cython-0.23.4.ebuild
+++ b/dev-python/cython/cython-0.23.4.ebuild
@ -17,7 +17,7 @@ SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"

 RDEPEND=""
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@ -1,4 +1,4 @@
 DIST defusedxml-0.4.1.tar.gz 48889 SHA256 cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 WHIRLPOOL 9f3f51af296e3fd16b2cd94029481fbabb687c986f39810dcba331c9d3e5e30e0b294f9f1f5ce031ea28053f33be1a13e89d65ef7d0c6a3333e81dc764868d7e
-EBUILD defusedxml-0.4.1-r1.ebuild 617 SHA256 07caf848558d402ddea5362ebe2e27bc228cc2017a2867fe6f43d9b5c056da8f SHA512 90e0147a6851e79588f4c0d642debad124ce64959009fda5bce36567d3775066c152b261c8b5e04b5b6479a965ea10e89c88eac99ad544d3a08817dd44d591fe WHIRLPOOL bcb53b81cd839c26b50ca0dd610f52e089ddc3fd6265d2e6eab7ac582d604e026e3e8ba45f8a43989336fecbce0f5ecd33429beb7b07dc230eb05359a76cc4e6
+EBUILD defusedxml-0.4.1-r1.ebuild 645 SHA256 75550496b99f85d4c301e882953f844a59af7d54d97fe0fc5be8a3db82b24b83 SHA512 07f5344d79cd89250c08a34ffbc77f146be590fbfef896dc6af026afd07842bf94c77112f7ab1f93fdbcc99917a05ef185f4a874a0ef00fb41d65c15ff9a1c9a WHIRLPOOL 39099e09d25444d40298008b346c3ce2f3d57a6da5dac643be9678d6b159f8f25cb64e56d9444c080de5290ca6f605678ebc7e8822a5d43c42cfb85431da8c76
 MISC ChangeLog 2206 SHA256 2e77249b77fca0fa9f5d8d9f3d0dd72068d8b05ee2317783b7d69d1b454fc21f SHA512 c51295bb5406c96f4be2cd7fa022cde0f69042f4563b00b1fb9e73105f194319619337614819902f8d4aaa0b9f2ca115f3f0f2f6c1d68bc6b8671840521029b0 WHIRLPOOL 7d7849d4beafa461982b784ce6a32cdb0de7d5507ebfa8306aa90adf59c4399c971ff5e80064093d3e581676f86d6a9e38885243d60c7430f91d6b6b86c178af
 MISC metadata.xml 299 SHA256 60d764c4e0c58219a54c27d0e0ab19afe0b394c45b5e6662696baca422586478 SHA512 73df90294ba092b091ef07d7981d0e90cf0428d5a333ddb9478436824de2a2b6373e860521b20831c83e706230747b9568a6e54b4b25a55a56099ce67ad306eb WHIRLPOOL 857db73c8f681b5c8fd4380d6ebe2b9f22c651fcfab6ed8e6e43638c5f475148f158031e85d8c1011f4321244c9d3b7e26e10afd1bccc854e6bc43217d6c5298
--- a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
@ -12,7 +12,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm hppa ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="examples"

 LICENSE="PSF-2"
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@ -1,4 +1,3 @@
 DIST distlib-0.2.1.zip 542424 SHA256 d91dc4a509ca50d1ba796ba1c4b23d5587f082d8a886856544546c88f4d9a685 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77 WHIRLPOOL 86c2eb318c9df8233847b5ded3370d77ed71fab22067f4fa039531d5a3df2ede463e1688d920401a0870e4359f18f8d765230c72e71be1458e5db14de153ad8d
-EBUILD distlib-0.2.1-r1.ebuild 611 SHA256 bd83a248b4b8c58901a1c6988d8bbd58b5ea4ed59a4a265bb960c4649f121402 SHA512 08c425dc979ac9b05358f06d83567b49c98260fa056f87bcab2df393ea522a7862b4ca38dafbf294ca68c706e41e84f6b5829cd9d70435dd411417f2ed250242 WHIRLPOOL 8d46178443a92312cde326b4f1826410115e9f15208b9c0918f9e28df51f936abaacd0b4d30bc60839ba2274c3bbc498c2d358fbc1b88bcd60d5cdcaaae15812
-EBUILD distlib-0.2.1.ebuild 647 SHA256 7c7d1e3b13757e1791f6b8b33db2b8b64be1541bb49f626e4add281426eccfef SHA512 89e5de854c740067d644b979f3e356c2f6644dd1ccf9b5d26f2998c2ba53fc6657e14e445cb1ff6dbb4f73df0034ecfd65f4884d9fd775e96f305464a32cae5c WHIRLPOOL 3cd5b8a13c9a907af7320bbe8cefb9695dd280cadfee14c26e90d24ba60a77915adf3df7f3a88788b9b68c6c9c4498cd7010549e9ea8ed1380b3dbcc42cffd31
+EBUILD distlib-0.2.1.ebuild 683 SHA256 ef2f4524fb6a511c9d7a35974364211d382e9207ddb35289b62523b48fa31105 SHA512 67df0e1e4f79245aecfe8f8d45a4bd608f99175d773f3e032d8cc3c1b0634bc9f846cce0d26e48db39b8b1412e302666c509f8380aed65ec98230e9c4acbc7d1 WHIRLPOOL 6711c5409b48cf8755808b3c04c6289990b70bfea934b7099e77acc9ee08df9013767d4ea47440d113d01af3265834d85f13bb373c35e185ac56ed6384205100
 MISC metadata.xml 346 SHA256 5b7ca0cf4eb4eeff99b943b4bc93113024c8ea10a1f2bac7c0ed5749b89b38b4 SHA512 670f3157b551581909bb7d1a7aedefb6d4b5060a4c3b227f7ed56ef6285c05bf08e13b28c18799612a06b5946090f573707826976e738605df76790321b0172f WHIRLPOOL ad141b53b0a7c2ce49d5e310f837e2d3bb0bf5d86861e2158e1d3ef9749dd1583b237e4b999bcb77bdc8205ca5774c4ef7f2313bb2dfec470ea664ec892d49f1
--- a/dev-python/distlib/distlib-0.2.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-python_test() {
-	sed \
-		-e '/PIP_AVAILABLE/s:True:False:g' \
-		-i tests/*py || die
-	PYTHONHASHSEED=0 esetup.py test
-}
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3  )

 inherit distutils-r1

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 python_test() {
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 SHA256 fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3 WHIRLPOOL 5769ff459cee4b55d325061158b4b7726c15489bd3acd45ef6028cf10748c2e0f70ebe4f5a99c59a17cbd800a4edf927eec924ed73297bab0b1c5a6edceeb0ea
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 635 SHA256 bac98cb71ea10bcb5958d8ff4d827207c9481a94f19b1eb8b7b30301a04d9648 SHA512 6b4889aeb757c4620efa54235f32f733c39dc5b843320a10e3861dfd25aac6ee4be102f8ede86cf1306ad9bb3d76616475f390545970f1645cfa16287fae4c4e WHIRLPOOL 2986b42cefc8029a27c00231f6d21bb793e09fa3fe0939aef25cb602811e3718f94cfe1ec360c90483a85ac013c3862a76e2725f1904ec0c2d4f662c0c5fae71
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 640 SHA256 5250c69ae3d2b42351ca3d39a41e051f9cefb698cbc1d902a23596809c0f6438 SHA512 ae5c24338be776261adcb7f868093a5ae339fa7c5bad3ce0e55177f36790c06110ed08e89b370e945786e0b32f518f34cc1fb2cd323c429754f9755c508fd3fb WHIRLPOOL 5754660e98d1f81312e879bdff4dcf992890ac4db15ebd1b365d1b4e820e1d005d78104f080147d1cc71efd4e1e3da84a1dc15e5c73257c8e07c7385c4441ade
 MISC metadata.xml 374 SHA256 362cc74023a0339ad835c2102c5a00cdf9580c0a3b81b9414045539e113f828a SHA512 7c4fbc0b9b2bfbdb83e3a38c2ddcadd58181301ce5bab6419963bbc50e188ecb9fed40ce66eb7518909818025cb149dac126873a2fceda4b4083adbdddbbfbcb WHIRLPOOL 3a1820aa2085dccda9b1001f9a9495836ef6c3c36b01da22ff178cc31117458347eb7e43ca028dc4c1ade0bae18561b520d8046a07ef71842c0a5f09fbe2bfeb
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@ -11,8 +11,7 @@ DIST docutils-0.9.1.tar.gz 1541437 SHA256 e89f187dbbc6674f839239c89fec44af9f1880
 DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19
 EBUILD docutils-0.10.ebuild 2050 SHA256 b2906e16efd584fbcaec069756d62ace94600bfc1a7febc41b7c450d77cd84f8 SHA512 6612e40737832cf765ae622837b612c7b3efde5f9d905a3b13c516fbd28f4fb7dec6937e7814dc576d84663f83ddc267f861781e4ee84d03366b24e896125f3d WHIRLPOOL def79b42f813705a2759f24ed52ced68fd45efd3cabbeb1833a01e334f45c05399459e084224eaacb8a56806a2797e1178b275c17284c923995b35da0158ad1d
 EBUILD docutils-0.11.ebuild 1982 SHA256 90bf3af3b406590456fb4a50720e19beed4269c9d61ddaf588dd245040fdd314 SHA512 8960ddc4e9bf2cf1b85608a7bdaa5cafd5545bfae4c15ce059bb751046c545a2086881a13c5d97b90da4a1fbaa5c7f206a2d7fca0c6a3befce3a308868464838 WHIRLPOOL 8060e8ddcfbd31c452133bac199337cc07dbb8752f9b70fbdba1b75f00c72b46342ede107a2db157f12d2d5ab9cefcc90272d3aa89345dac35e1bca012448ed3
-EBUILD docutils-0.12-r1.ebuild 1866 SHA256 67bc19e4c5305d7e5b2f3a5582c3443174fbdc9aa3901bb68473f34d0cfc87a9 SHA512 881f1e239b1418cd96d4e1cdb679f69245f22c8bd6acfc0a00a3fed204121c4e3c8e7a44866adb4cbd709baedc07fb03180cfc0cf84b95465d6fa7bdcc65156f WHIRLPOOL 71fb9744a3ec2143a282887ea862f7cefb2363d261f7d08acf6581375d93ef06f3bd9ca1767cbe2fedff0fbe2f3968854b98ba912b8124bd04db3891d5c13555
-EBUILD docutils-0.12.ebuild 1918 SHA256 c24d2b5c8f56da102b96179b4d46e9067148398651a3e4d8d0d7529e6b11b773 SHA512 c76af55f045732bfe99f8549dfc9b6c91738104b47c11297856675adefe34a57cfaa164f4f53c98b340714ad9443760b85671a86ab5bb45429055bd8f677cfde WHIRLPOOL ff4382eeb28b40312d431962f1764a6e45e3e9e2a21cfe22d2dd92bdb9e0ae616204b73abafa4361a02775fd32f32dca7e72b21e81f81d889b5a30f1cc1b83cc
+EBUILD docutils-0.12.ebuild 1929 SHA256 99218e52e18bc59fd5a2a0af714c78bceb208aba6bda3cd7bf285fe21808e371 SHA512 efded41e1d00d79572d5e117109ed366fe6ceb9ec5e372b618fd2e4434b0965be65000ff14c29ebb3a0422323042229bfc5b8c891155b60b5289305908616425 WHIRLPOOL 19dda847eb31b905253840347ef4fde26c0846f8971b1c23efc2902342575ed6eb68bfab182b307cb849692e5c28fabf0e2204cb51e3c177f864e860a9bbf274
 EBUILD docutils-0.9.1-r1.ebuild 2634 SHA256 d8d4335befc3c2833bf986e84dc35018db266590f6dd0f37324ddca843fbbd89 SHA512 74bf8a225650fd2b9bd40d724170c385e80c573452ed0add800955c3b5108b758d42e8b4ffa9524f56b50e21d72ffc959989f28fe1285f7c208d2691ef1c9392 WHIRLPOOL 9e8322ca724f78eeb457239ee1fb71d745b83cd6bbd8ba2220a8b6a9dcc955ea207fa2647ad81667679a983b2efb9d82a02fa4317117f924e0d295d8971126f4
 MISC ChangeLog 29096 SHA256 7f00344a2d694a55ddc99915c727ce6ac92d1e53d375443dc00a5ed45537ca3b SHA512 346423f639b788cdb1b6e5bbc54b7100f077650893f05fdcb02d839e9feb1c81808c0a7b7f1e792f5d8e64da280d0a2500e20b7c5e1b74e13585f32a9161bc97 WHIRLPOOL 190c76721de345eb9437b806826a862f34862ba2f49c2fd96cf02de3ebc8b564fd64b4a805387226482945c47b9acbbb10b2031852dea4dd4c3c9028de6f8d1b
 MISC metadata.xml 306 SHA256 fcd9a587a255c43a46071c5dca6d8032b82dd47ef3def969a8fd0a71263565dd SHA512 7566f67462290bb6b6bfe1c754482080c36e78b2939e9e35129353059b10bed8682a6df6ddb6f6952fa42502440b0d290ef8a3d1e3aa1698b1cbaa30613e3337 WHIRLPOOL 807876c62134278acdad204bd2cec4e7713a367a964f49e166dc21387f4474572208190d30bd529a489822ea23c418643287f1e8e7a100e149120e771ee6eca5
--- a/dev-python/docutils/docutils-0.12-r1.ebuild
+++ b/dev-python/docutils/docutils-0.12-r1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )

 inherit distutils-r1

@ -13,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@ -4,6 +4,6 @@ DIST execnet-1.3.0.tar.gz 170489 SHA256 ecdfd5613cc78fe99aaf3e351bc870d1428202d7
 DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
 EBUILD execnet-1.2.0-r2.ebuild 1082 SHA256 aab8ffffd1b2ae016913f092e420dfa0dac243b91176cdd773d9319c75a69cec SHA512 4df9a88382b91e0c2ef511145dc940deb44755d95f2197a6185e6959953525df7523ebf21f69cf619f04de617563d938c5afc4db433905ee61b7114f476ea130 WHIRLPOOL 5c4cf5ff4312ffc67124568f5870050f418b5edf159331f3770ad961c17a0cbd63786851fdcb872f840238d8f8103bcc3af60331a69a164d6ac1fb4695885147
 EBUILD execnet-1.3.0.ebuild 1092 SHA256 4dbf68f57765d6f202f143c63feecfab002bd401ad3d45baa19802186551d642 SHA512 49f762f45eaa4385bf36044c2a195a26afcd401379fe4f013572a4e8bd562afcfbd50de55b903c3edaef72075a1bbd98539410511d90d262b0f83ba0b6bd8c9c WHIRLPOOL 3d5a0cf1f86a9271e939ee3fce5d2a504451400ca1a509be417f737feb7a75ce23070809753cdde5572199a9e00d063e353cfd75c504e299890fd5d365784538
-EBUILD execnet-1.4.1.ebuild 1190 SHA256 1b6050b0ce6ada323a8df7d1437852f7ef9ac5cf84c3040e5c16853f6fbf5b8b SHA512 9df096901c4560b68a42f3b2f0da5e8bd42d2c9886a05c388f84146fa29e63cc4ab4bfa999109b12f708fe44b051e90b24a7ea97e0c9cc452e77e1be817ea2b6 WHIRLPOOL d1448bfa8009d673301ce753f1ffcd3b13e2504e579f99242eb57716e1ecef4335d270200e0b4ab5778161e89188ef09e1df58bb06bdb1adac3036ed15990516
+EBUILD execnet-1.4.1.ebuild 1194 SHA256 a334596cbd76685a641bd612497d1749dcce98b7449257f5350154f1c0c67f69 SHA512 cf76db7dcfcd1c86ea5a8bf07e8dd2940fcf37a7788b049b9cd938fdd0eea6d14731cbe1eecb085266779891dc2fcab0f564538484d41072adbd86667a856c9d WHIRLPOOL 6a74856eaa8fea4a25be1c0272d688b67642432c811e7611d24a1f3b2c53a002148a9ccd19519b2c4a00e5ecc8c42e38591b5b942dca036dd7cc25016e6185b0
 MISC ChangeLog 3979 SHA256 ab583d6fbd59ee50fde491589b5e6a7c2c4bb62ff4479fbbc4fc9d71ebf2fb4d SHA512 84b40ef3c6a615dc001340a98a51e97ecebe94f0b3fdf6f89389115b3c3a2767b5f2f6991e4921685ab92e979572254e55ec93effc5a2d6d4de8a921873aaff4 WHIRLPOOL a9d65042dd8a1c54f764929cda16c738735c5069df42b3f5e13754d897a3e5e6e76dc0e005603579971cb6b626439a8f4a1e0e203f840ff203b9bcdfd42c0148
 MISC metadata.xml 443 SHA256 b38fdb5d7dba3a8b2167cf95e64ec10f8e01c911ea5397a2efd00ffbecc0865e SHA512 db1c66776ca96df607ef08a806f41954b1b7677fa32c02e33ae67a8daaf04b797c6f8bbc17e53fdbfadc0cb473ead82347fa1374dace31fb18722428bd7a91cf WHIRLPOOL bec892ffd13dcd5b7744c2fb0a049007cc628fa6047d0b4f232ee91552bd2e62d2e17d564aab77435f62d6285d4e237f493f95ca8f63f1b740de070f4b9eb617
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )

 inherit distutils-r1

--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@ -1,5 +1,4 @@
 DIST extras-0.0.3.tar.gz 6231 SHA256 7a60d84cb661b477c41a5ea35e931ae93860af8cd259ecc0a38a32ef1ae9ffc0 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c WHIRLPOOL a80db53c4b536d1a98c03237cc56607ca477619d1789a4a4c4795c843212eb1bdc64f0fe2a0ae1d4a4bab351ec68e07acb9ae494e537630ba841826116121d2c
-EBUILD extras-0.0.3-r1.ebuild 684 SHA256 2f995003dda9b8ffc8f0afe035df57b5b80fff5ab30b18dfa7402cc9e3398ada SHA512 5bd6286302ed52996e2b66961100aed63aa713e45a7da87521f0cf09c84e606c985bc6d1aaa367deddaa2d943104f1266fef16239e483760227cf188bc3d9d22 WHIRLPOOL 5d0b7cc8b91ef4736e9c82a8f5fa8e78cfca3684aedb8d07f696fdc99bcc72716330e435a0b521d668e02b32b4fc946ff5317ec599b9c743807b709260210c9b
-EBUILD extras-0.0.3.ebuild 725 SHA256 5682769fc70609c63322a89132cd6791e1c7d7fd3ee253cf1ad87c797761f217 SHA512 38d3f164159b0e22308eaaa1fd95e968189233e55730d6fe2ae598f8241c1ba5b0a4c907675a8e39f961f41df2f831ffe56ebb4a5245122ea2c2211252d4d4de WHIRLPOOL 39feaea8ec9e822e0aff5b234d9eab1c59b83e4fb25f709fbe00c39f3290301364bff8e203d4f5bd925168af21a61894cbc2084ce25a599f9a9abd990c3f66fb
+EBUILD extras-0.0.3.ebuild 747 SHA256 73b94af8e779f4016ee59faf243dc9de5aa1e28c234b40fe3a9b344a0cb02709 SHA512 20bdfcf45b1b37826f84532cc2b9ae696ff876124615d25435ab9c69e3c25b5f4333cfae138591496d19e7b9ffce2027d96a5f41545f4b44f9b6be71dcb2a396 WHIRLPOOL 68c9b54750eeeb45079f1d7625aa7db6054dcf6a71d560aaf6433756c60e9535a14bb9fdfc39581cb295abf5c8e5184a78d21dbbe12a16ac57e126a42ac8b7d3
 MISC ChangeLog 3296 SHA256 f003f71c128cc1aef6a5c2e77d122228cc1c04b29ea7659d3599286fb4279784 SHA512 f7160768d26c4f7741750ec458834f123b95afcf707e6347d56f33fd401578fa69ebb2509a7487023838015184b5cea3ac136aeaf58250e84da6ecec12a5df1f WHIRLPOOL 7c7f31e744812232175f56357911b0064db25f8d026ca8d48073e9a6d4d03bc38d99205836d84ced7ee6d7bfc05ac9fc1dc6f9ab3e55b78fe7d220b824520750
 MISC metadata.xml 296 SHA256 8efa75e1a0fe6bd9262fe598a47e06e60eee6c08b393c7b9aedbe08f98d342fb SHA512 626f0fe0c60bd527aea090ec8f9d052e01c88e1000c880ca16ecd03b65dc132e93c8e3727442cefa57f549d8e8e92fb728ea4909e94b171ad61157cee3cbbaf2 WHIRLPOOL d87f615d0e07894a2c08250bcd2012246a8dbecc8d9174d780bb347a6517e996ff802a723451cd772df2b68d0289c98762544e3281c8bc54ffe5a3f49a173f43
--- a/Show More
+++ b/Show More