diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
deleted file mode 100644
index a6d6fb5792c7..000000000000
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-src_install() {
-	dodir /opt/gentoo-rsync
-	cp "${FILESDIR}"/rsync-gentoo-portage.sh "${D}"/opt/gentoo-rsync
-	cp "${FILESDIR}"/rsynclogparse-extended.pl "${D}"/opt/gentoo-rsync
-	insinto etc/rsync
-	doins "${FILESDIR}"/rsyncd.conf
-	doins "${FILESDIR}"/rsyncd.motd
-	doins "${FILESDIR}"/gentoo-mirror.conf
-	dodir /opt/gentoo-rsync/portage
-}
-
-pkg_postinst() {
-	elog "The rsync-mirror is now installed into /opt/gentoo-rsync"
-	elog "The local portage copy resides in      /opt/gentoo-rsync/portage"
-	elog "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
-	elog "configuration of your main rsync server and use it so sync."
-	elog "Change /etc/rsync/rsyncd.motd to display your correct alias."
-	elog
-	elog "RSYNC_OPTS="--config=/etc/rsync/rsyncd.conf" needs"
-	elog "to be set in /etc/conf.d/rsyncd to make allow syncing."
-	elog
-	elog "The service can be started using /etc/init.d/rsyncd start"
-	elog "If you are setting up an official mirror, don't forget to add"
-	elog "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree every 30 minutes."
-	elog
-	elog "If you are setting up a private (unofficial) mirror, you can add"
-	elog "0 3 * * *	root	/opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree once per day."
-	elog
-	elog "****IMPORTANT****"
-	elog "If you are setting up a private mirror, DO NOT sync against the"
-	elog "gentoo.org official rotations more than once a day.  Doing so puts"
-	elog "you at risk of having your IP address banned from the rotations."
-	elog
-	elog "For more information visit: https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-}
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
index 13e45a98ce3f..f9643478717d 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
index b5fd02481bd3..f5bdd23dcd86 100644
--- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
@@ -6,11 +6,12 @@ EAPI=6
 DESCRIPTION="Filesystem Integrity Checker"
 SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/petrovich"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
 
-DEPEND="virtual/perl-Digest-MD5"
+RDEPEND="virtual/perl-Digest-MD5"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 75fe8c03421f..80b26c9af0af 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
 DIST sudo-1.8.18p1.tar.gz 2822109 SHA256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 SHA512 8dceeb5024c4f94fcc15e75fa2fd164af5e0597734f95df43207738b3258c4d396e102faf2b6811e399f1cdbdbf617b87e5bfcc1e591ea6722f45d81d1098fe5 WHIRLPOOL 094c1232517706a6da4a0548f7ab5c0c7b9e12f8ce584db97d0c4793a38c4044538637f2834b9f3104326bd5b4b826d08ab79b1dc2c5b950de7d7f558685ef7b
 DIST sudo-1.8.19p2.tar.gz 2861855 SHA256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 SHA512 21c83403e7ff219a273b2c4873be0d858997558ca150bc8239379a9dfcc587fdd7c0c49cdf4cdc27dfd6dd45f9f089fa034b58bfcee07dceb4a481542251b3fc WHIRLPOOL 550ed115ea711d6ba9aa698cd988295b74327dd770d79b6852f9f3f00a1c0420bbdcce5cc7c49467e0cf8a57fc79dbcfc73edaf3ad697e06ba9fd48919fece0b
-DIST sudo-1.8.20rc1.tar.gz 2924556 SHA256 94e1aba09955f386ecc900263870aa06725b64e36af27acfa695ea70fdb1a5b2 SHA512 0fca3a7fc98d900481eb9ec6a058c13a44852e99558800699171c6c817b34878e3ddafb8641755f056fd775590466c41ca4ec4fcd9f5678d94ca914bcdf2a190 WHIRLPOOL fef57eda0b737962967e8647d8443551e25a12316a3e830c442514f0425128d69efb8bf0303e0ece974808489befb06f65c3c43d3a20e8655ba58fc7553718e5
+DIST sudo-1.8.20rc2.tar.gz 2924906 SHA256 1748abfde7a7fe34f571553e975c64baeb2c48c28ad95e35d64c8e7d56bf1cfe SHA512 dd24e09a39a0b4a179ac7e38d19c12959be8bf4ed32fc8c27d139c01f41680d1116d2905e54b539cfbda61b1530dbb8cfab8a4d82e6a4b03ac5d3ffbbf8b6690 WHIRLPOOL 9f93f43784a94bdbaf5ac2f69a4691bc775f34cef532a0913c568f673fb8507830fbaa395789ca7e2674f8a62e848fda9106f58f4513ca82f48d1a82be0bdda7
diff --git a/app-admin/sudo/sudo-1.8.20_rc1.ebuild b/app-admin/sudo/sudo-1.8.20_rc2.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.8.20_rc1.ebuild
rename to app-admin/sudo/sudo-1.8.20_rc2.ebuild
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 41e29fcbde40..1fff8b9f8788 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,2 +1,3 @@
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
 DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
+DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
new file mode 100644
index 000000000000..4591ceb4645b
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
+	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/krb5-types.h
+	/usr/include/cms_asn1.h
+	/usr/include/digest_asn1.h
+	/usr/include/hdb_asn1.h
+	/usr/include/krb5_asn1.h
+	/usr/include/pkcs12_asn1.h
+	/usr/include/pkinit_asn1.h
+	/usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	eapply "${FILESDIR}/heimdal_tinfo.patch"
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use berkdb; then
+		myconf+=(
+			--with-berkeley-db
+			--with-berkeley-db-include="$(db_includedir)"
+		)
+	else
+		myconf+=(
+			--without-berkeley-db
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		--enable-pthread-support \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with caps capng) \
+		$(multilib_native_use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(multilib_native_use_with X x) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake -j1
+	else
+		emake -C include -j1
+		emake -C lib -j1
+		emake -C kdc -j1
+		emake -C tools -j1
+		emake -C tests/plugin -j1
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+	else
+		emake -C include DESTDIR="${D}" install
+		emake -C lib DESTDIR="${D}" install
+		emake -C kdc DESTDIR="${D}" install
+		emake -C tools DESTDIR="${D}" install
+		emake -C tests/plugin DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog* README NEWS TODO
+
+	# client rename
+	mv "${D}"/usr/share/man/man1/{,k}su.1
+	mv "${D}"/usr/bin/{,k}su
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${S}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	prune_libtool_files
+
+	# default database dir
+	keepdir /var/heimdal
+}
diff --git a/app-emacs/yaml-mode/Manifest b/app-emacs/yaml-mode/Manifest
index 0413ecad1b42..b062458d7aa9 100644
--- a/app-emacs/yaml-mode/Manifest
+++ b/app-emacs/yaml-mode/Manifest
@@ -1,2 +1,2 @@
-DIST yaml-mode-0.0.8.tar.gz 6271 SHA256 88695798a4df55e5d42e880b7d24b18d180cc0a9989f8057ea48ec66365586f5 SHA512 3239d834b1202058d3414130b6374301f502b57e852786396a8d4e4d83e7e6c6a89b845799a0fbfdb458a93a85d8a03a1574522be38f929d032de4bc06f2935b WHIRLPOOL 2ba200432a107f00470dbfec9d5c7ee6cd4c586bf83b5b350987f3c0e7f3cc41be8d9974e65dcec45e2247f2768da56d184826e19ee82f0152a154004b50a9a2
+DIST yaml-mode-0.0.13.tar.gz 14446 SHA256 c547b1ec62e6b39fd3e95e28b8d3918958d4f00391c471485532dbc6cc3dcab8 SHA512 10876dfe576045bde363f62880ab3c91894d965c9dc1b7ff2b86783d31c05ab844c0abd77bcb1f7b5346d99969d69833ff4e5dc1b5700f7856fbd3dc4eebd5ef WHIRLPOOL 03300816f056fbe3d3e590c0f81a3593370b53f5c49aefb166bdbcca6823ffe4e4dae61dd4a0f091bff56f86cd33f07c8e2443dae3ba12910e1dc6b82169369b
 DIST yaml-mode-0.0.9.tar.gz 6498 SHA256 5d65852d9d738fd1966125f8ae737760ae48e647030e1aa5a78fd703f54358fc SHA512 cdfb0694d2efe5bb86ab5280e78d577d5bdac906a7745c6e988128cbb001f1f78569199288e2c12e7977a35c35f9e47f3271747bf26fcdfab5d2a961295550ea WHIRLPOOL 58ee875ce20ab49595b4372a979417deb672c09647f5b0859d3dddf484302b8bf4b65243e18709d7d6edec757d6528a59814f4b9f56fe98178d4966fcba5018f
diff --git a/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el b/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
index d535ff479b81..7f6db15560f4 100644
--- a/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
+++ b/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
@@ -1,3 +1,3 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'yaml-mode "yaml-mode" "Simple mode to edit YAML." t)
-(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode))
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.8.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
similarity index 56%
rename from app-emacs/yaml-mode/yaml-mode-0.0.8.ebuild
rename to app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
index b86ee01682f3..36ae75dea89c 100644
--- a/app-emacs/yaml-mode/yaml-mode-0.0.8.ebuild
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit elisp
 
 DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
 HOMEPAGE="https://github.com/yoshiki/yaml-mode"
-SRC_URI="mirror://github/yoshiki/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/yoshiki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+#S="${WORKDIR}/${PN}-release-${PV}"
 DOCS="README Changes"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index dffca81ef497..18b680672854 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,3 @@
-DIST docker-compose-1.10.0.tar.gz 165100 SHA256 3ff5179d9b2e39f1fc7216d1184e03044074c54b28a2d30ec08abe3da1177e08 SHA512 a3c7ac837ff036eb4f943a24c5b692654ea028e68306e60df675a7ac49e5099160b55e444fdf1d1f133d0da1270f199022f7cd3539e3b727fc81ea8711248f9e WHIRLPOOL 230614937a454b503609b8e5e2ca2768d61815f3d6dae53fde4b00308bb36767dd6b46c4d35e66661210b2a218f32915d1c93ca9f3702804aa353bdef55543db
-DIST docker-compose-1.10.1.tar.gz 182052 SHA256 610768fe21bd8606c1fbbde50a4d70604dcb498dc9dfeb8de0c41a4e8db84293 SHA512 20acb31e601687bca06e20f66415ae9a52e186a78a87952a0f9393a64476de9dc3fac01e72269ee50150be76a58187a37728769abe79efe07b2ea830ee557e80 WHIRLPOOL c7ee9b363a96f44a898d7cc8d251a192c33d2dfc555feeb246bae1b7653b66fdb9ece02fc02572d646c7a10f4b681b0ffbb8b2902d0e99f0a689860edfacae9f
-DIST docker-compose-1.11.1.tar.gz 185395 SHA256 509eeca9b95518fe9d3767ab0e0ffde5e33312fe02b2fec46e555078e7f07dd9 SHA512 4b1a5c54b28b1ba9546f78fbca153511e598d41b480aded12dde31691ec13e8253936ce5f0c608a726ad000d2ce0fde6a792e59b32013beb65b0f581eb8d4368 WHIRLPOOL 04cb53457fc93ac76a017efdfeb146716829cd9d35249bd93fafded305533b0eb5f60c37556a024b7eced26b4ec67b4a5d62c797ca3b1bed59b90173a1430d47
 DIST docker-compose-1.11.2.tar.gz 186465 SHA256 e6cb8862f867d2882a93dd5bdcd3bf21dad5740c1ec1f32132c9a3801506ba54 SHA512 0b7668ee16738d9a898117737c8fb3de298fc0db2127b1a66f29469ab30ada609900498bb2906b63edd0cf2c469dd1db1e71756b1e620c44fd1aece37f60796b WHIRLPOOL 64a3629908185fb278e6dd780438edb27ab463e1b66f801e36c2a7fcf0d3913c23fbf41df775a7a843327e8016dd8e506b9243cd07b811c92f419883d5c6b839
 DIST docker-compose-1.12.0.tar.gz 198453 SHA256 3da6f465eac5704393d8acd95b1923ce0bda3f0312883527c92dfab7de5b313e SHA512 7d454b9a4210e4ec708d9b1b0e0eff58465f68747bac282c4163ee3abeb32f9907f32ac86fde56fbccb6af9927a61b68dd671263b5ded13a78a37e2ac4db2669 WHIRLPOOL e2dff82aadd5b3be56485a8e7743d50b3e6eac7cf1873f392df05354ad6716476cb4606532630cd309a673c0355b7910c93456af70341e153f5df3bf486f4bf6
+DIST docker-compose-1.13.0.tar.gz 201429 SHA256 3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c SHA512 a435cd1634a66924e04b89ca8b3481bb0e4288b03a2e9acc50d01b56a40996e0d51a2d856da8ef6a6e784617b4cda85f7966c372e256dc8b7b0ab0f0ebf60a20 WHIRLPOOL 1e6652f97c55705a0e97f6a16f95a2659ef6ef5f53cc85bb6f8a416d711dca21eb3882912d528afbc68f1fb1d6f8d824273352e86b21e2168f9af812790bcbfc
diff --git a/app-emulation/docker-compose/docker-compose-1.10.0.ebuild b/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
deleted file mode 100644
index 7f343eaf763f..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.10.1.ebuild b/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
deleted file mode 100644
index 387d29c4878a..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.2[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.11.1.ebuild b/app-emulation/docker-compose/docker-compose-1.13.0.ebuild
similarity index 96%
rename from app-emulation/docker-compose/docker-compose-1.11.1.ebuild
rename to app-emulation/docker-compose/docker-compose-1.13.0.ebuild
index 387d29c4878a..55f1c9c5eb92 100644
--- a/app-emulation/docker-compose/docker-compose-1.11.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit bash-completion-r1 distutils-r1 vcs-snapshot
 
@@ -25,7 +25,7 @@ CDEPEND="
 	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.2.1[${PYTHON_USEDEP}]
 	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 29210a4e5645..c3f78c36d6ad 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,4 @@
 DIST docker-1.12.6.tar.gz 13694205 SHA256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e SHA512 98e0fa0ec0dad4d392188b0d2cf42b2b564403463c369e1fe060f1abc2e97d97375a88587080671ef905e6a34b991d83265f43c3112575af019cf85eef0c2c25 WHIRLPOOL 55d10e4c4ab960320094637a847768ad85dc1fccaa6cc77ea0ca82f2d23b27e92e2f2c0cbc03f53676012c95883f65c6fa16d26970138fa129d37bf278fc8c0b
 DIST docker-17.03.1.tar.gz 7773296 SHA256 a8f1eefadf3966885ad0579facfc2017cca7dd3a0b20d086dfd798168716cb83 SHA512 51e2a9d6ca529ac67d63794b9fd257f962278019ae1a36a39ff635c742d6ca16286cc164470333ff6cd88d709ecf2cb90343b2dd94bb3939747550f74fb442d5 WHIRLPOOL 9178bdf5b13851650e31d95370a090a72c8c70b53416e83693ffbdbc549d3992f3004908c1db5b26c013552f02293dddf9f761b8b5b9d2e0f0bf7cfab5330ca9
 DIST docker-17.04.0.tar.gz 7023868 SHA256 b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640 SHA512 b84bf25ebbdf066ee61272b9bce4736f61c2605e17529088bea33f5a4de172c2297cf8e7bd3f48170d50de069f94343d2403f81b763e9677ca2e750192ba1519 WHIRLPOOL 30354c38ae07f8528fdcbcde866ccc0048d6ea9e4001dfcc04c535b169c7b6c7d87f1c621039f215466d5f1fba4f0c886e231c77f70fc9d7ea109398e8e0df26
-DIST docker-17.05.0_rc1.tar.gz 7164632 SHA256 b35975f1374313c1c0d034a0963296b55d0fbac726c156bcf7a8a9f91db286da SHA512 54a0152a00f3c8abcaad83318d736b58da7fdbbb76acd42cf94c834f9ffb6b43feaad68668cde778ef9d4adbdbb2ba958be6ec2cbde4e2b1097e7a92fc52ce1e WHIRLPOOL dfee6945db6beefa268fc1d9ebaa6bd5b2624b7e01f195e57518deb664172f222cc991e847d78e9b1ec051a69e164ff26f6d96ad1eabbf0328429d6f6f509f70
-DIST docker-17.05.0_rc2.tar.gz 7166976 SHA256 9a2930c95c2301ffb1ec04bd6fa5e81f6424128bb975ac4c2bd98ece33432a7e SHA512 b9f60a4d26fc35d75905b91bd193d0830424914b88bbb5f853674598475d82064bee98e50857318276f7c2a0ac8e5a43d349257602dacc2c43f4af59a4720925 WHIRLPOOL 0b7396f970a8faa3f3c4a4645930113d080f1a4c693598999575b1d3d7a814e5143605e73a8830f823d763777c79f1cabafd4c980ae4f813ea4bfed9a8ab510e
+DIST docker-17.05.0_rc3.tar.gz 7167106 SHA256 227bcbceda2c4d763f1ea18a31bfac1dad670ddd1a11462c05282fb81cecfa1a SHA512 e3bc4454f895cc04858e6ca23e907efe0336da4602bd36912a92dbbf8278d1c59b56e150930e41b59906df1a5684314d05331a286459d471bb57c6434b97e3cc WHIRLPOOL 8de0a72422f9f0f02f2606d6370611d6cbfa8e65a9b3e76016fab0447b25b3d4871e62dafce0e983caf700f6742bbfe91ac475d79dcc6ad0f301c112ad05cbfa
diff --git a/app-emulation/docker/docker-17.05.0_rc2.ebuild b/app-emulation/docker/docker-17.05.0_rc2.ebuild
deleted file mode 100644
index 15b4a461efb8..000000000000
--- a/app-emulation/docker/docker-17.05.0_rc2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	MY_PV="$(get_version_component_range 1-3)"
-	[[ -n "$(get_version_component_range 4)" ]] && MY_PVRC="-$(get_version_component_range 4)" || MY_PVRC=""
-	DOCKER_GITCOMMIT="c57fdb2"
-	EGIT_COMMIT="v${MY_PV}-ce${MY_PVRC}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-# Runc/Containerd: Unfortunately docker does not version the releases, in order to avoid 
-# 	incompatiblities we depend on snapshots
-RDEPEND="
-	${CDEPEND}
-
-	!app-emulation/docker-bin
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	>=app-emulation/containerd-0.2.5_p20170329
-	~app-emulation/docker-runc-1.0.0_rc2_p20170310[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.13.1[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-client || die
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-		grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
-	fi
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	# time to build!
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# build the man pages too
-	./man/md2man-all.sh || die "unable to generate man pages"
-}
-
-src_install() {
-	VERSION="$(cat VERSION)"
-	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
-	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
diff --git a/app-emulation/docker/docker-17.05.0_rc1.ebuild b/app-emulation/docker/docker-17.05.0_rc3.ebuild
similarity index 99%
rename from app-emulation/docker/docker-17.05.0_rc1.ebuild
rename to app-emulation/docker/docker-17.05.0_rc3.ebuild
index 4e7bde26de20..0dae3c6412de 100644
--- a/app-emulation/docker/docker-17.05.0_rc1.ebuild
+++ b/app-emulation/docker/docker-17.05.0_rc3.ebuild
@@ -14,7 +14,7 @@ else
 	inherit versionator
 	MY_PV="$(get_version_component_range 1-3)"
 	[[ -n "$(get_version_component_range 4)" ]] && MY_PVRC="-$(get_version_component_range 4)" || MY_PVRC=""
-	DOCKER_GITCOMMIT="2878a85"
+	DOCKER_GITCOMMIT="90d35ab"
 	EGIT_COMMIT="v${MY_PV}-ce${MY_PVRC}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 5ae757756e54..cf88969fbaec 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,2 +1,4 @@
 DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
 DIST qemu-2.6.0.tar.bz2 25755267 SHA256 c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec SHA512 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215 WHIRLPOOL f9373bf66f67301787e7510ac161b0072ba7c7bc067e10215fb97a52524adaba0fcbc79a4c0cefac9c6e2b4e07380eb9d10f65ed6ce6867e43843043684231ed
+DIST qemu-2.8.1.tar.bz2 28366270 SHA256 018e4c7ed22c220395cf41f835d01505e49d0e579a548bd3d72b03809442bbcd SHA512 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda WHIRLPOOL c41f53f18fac44efd1c81ba9d95204d23e9a70dc9c21624177be2fe92a327428fd5704b25bc334229fa36ae395fb4c82ba3955db39719c4458343978a4d3141a
+DIST qemu-2.9.0.tar.bz2 28720490 SHA256 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 SHA512 4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422 WHIRLPOOL d79fe89eb271a56aee0cbd328e5f96999176b711afb5683d164b7b99d91e6dd2bfaf6e2ff4cd820a941c94f28116765cb07ffd5809d75c2f9654a67d56bfc0c1
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
new file mode 100644
index 000000000000..959db3ef084d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+else
+	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	!<app-emulation/qemu-1.1.1-r1
+	!<sys-apps/sysvinit-2.88-r5"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake V=1 qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
new file mode 100644
index 000000000000..959db3ef084d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+else
+	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	!<app-emulation/qemu-1.1.1-r1
+	!<sys-apps/sysvinit-2.88-r5"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake V=1 qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-emulation/qemu/qemu-2.9.0-r1.ebuild b/app-emulation/qemu/qemu-2.9.0-r1.ebuild
index 2d6bed861d6a..9fdaa1ebac5e 100644
--- a/app-emulation/qemu/qemu-2.9.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.9.0-r1.ebuild
@@ -50,6 +50,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
diff --git a/app-emulation/qemu/qemu-2.9.0-r51.ebuild b/app-emulation/qemu/qemu-2.9.0-r52.ebuild
similarity index 98%
rename from app-emulation/qemu/qemu-2.9.0-r51.ebuild
rename to app-emulation/qemu/qemu-2.9.0-r52.ebuild
index 1d51ab28f5c8..2138858891ac 100644
--- a/app-emulation/qemu/qemu-2.9.0-r51.ebuild
+++ b/app-emulation/qemu/qemu-2.9.0-r52.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 
-FIRMWARE_ABI_VERSION="2.9.0-r50"
+FIRMWARE_ABI_VERSION="2.9.0-r52"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
 	user udev fcaps readme.gentoo-r1 pax-utils l10n
@@ -53,6 +53,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
@@ -154,12 +155,12 @@ SOFTMMU_TOOLS_DEPEND="
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
 		~sys-firmware/ipxe-1.0.0_p20160620
-		~sys-firmware/seabios-1.10.1[binary,seavgabios]
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
 		~sys-firmware/sgabios-0.1_pre8
 	)
 	!pin-upstream-blobs? (
 		sys-firmware/ipxe
-		sys-firmware/seabios[seavgabios]
+		>=sys-firmware/seabios-1.10.2[seavgabios]
 		sys-firmware/sgabios
 	)"
 
@@ -683,8 +684,10 @@ src_install() {
 	if [[ -n ${softmmu_targets} ]]; then
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
 		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
 			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
 		fi
 
 		# Remove vgabios since we're using the seavgabios packaged one
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index c5cac4ad4c6b..f5ab6dbad239 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -52,6 +52,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 4b89d546073f..193dfe702e1f 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -5,6 +5,7 @@ DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
 DIST wine-2.5.tar.xz 18993176 SHA256 13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2 SHA512 7b6faf6d8aa3d41465ad93ebae055581136f736c7eb8b4c61682e5a05589c83a0ff2c85e0f9abbca016f31b6f1c1435617c4994f1913f715a8707ebee3f28467 WHIRLPOOL 5acd2ac65df5dee1c860ddca72b8df8e021a0b95a3a1870d15468ce4591d569fa15bf8a0a6d341bcd3a624d13d0affe5b0263e67f9dfcbbf3ae7b59218dcded9
 DIST wine-2.6.tar.xz 19023352 SHA256 e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 SHA512 2aa55413ac090e011725566d004e42ee46323cd4c6961b9faa63e3de422ba60bb657bf224a4d7e8aa712a8e26e11977d07acb7c088ffeef8c37310e8cc698970 WHIRLPOOL 82e6a06cc342c7d6eace64a97bae10cc39c120c5776170b059700542b8b6fef56be9a697f05b3bc21ae82621f4bf50f3ab478311c9a3a55d86ed7c0a009766b0
+DIST wine-2.7.tar.xz 19101108 SHA256 e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c SHA512 1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a WHIRLPOOL 133426a0313facc856eebad3d16d199948b780ce4c4561e5784845c119fe462b8942ed86fa5e823e729a997d704bd3c70f44a64ce3eef965b4f3eb92587dfa4d
 DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0945b990f74eba2b059e6206 SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1 WHIRLPOOL 53044c0a4b7159c3af75fc935d1ac45030e80dbfd70d787f64885ddc025cfcd62f724c3256e389a7fde680670e594101955f52301cf6b9bbf23ebc64552790c2
 DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
@@ -12,6 +13,7 @@ DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db4950
 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
 DIST wine-d3d9-2.5.tar.gz 48692 SHA256 8b28c16701ec1cefab11d41d00954a92a5ced9a63f1ede81e96f247d2f498f94 SHA512 8b5ebec6341f70ec977aabee35decbe2d22fe43e111c1fd6015066a2b0e4fd259cd964fdb79306a489be4406078cb1e241d90ed636222174ed4abcc8026e7d03 WHIRLPOOL d5fcc5fbea4c4a4900235d33cb5de8f2a7cbf2b51b1a5c47d75ab765aa88ce1f8f81a61eefe0a742a55bb2ca210747b345589628fd1020430e4d962319b1c6fe
 DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c159528745ff1063d617f31e2d SHA512 17df692df8ff3c1419258a3faf9ddacde67f185a797dce76cd07c07e6f4fa2040b981662d311329a80921c039bfba0da5fed3ee53f8c36e34eeaa92af1c7b755 WHIRLPOOL e614b4af0f3c92113617f533255fd67a4b322bdaf0939fb98e09bf77e3b0437cb2b813032e33300e45294a60d5c3586a302669c28c293e180c775666cddc2581
+DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b
 DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688 WHIRLPOOL e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54
 DIST wine-staging-2.0.tar.gz 10182575 SHA256 22a43cb50c1fff9c6f233a965247056e3321533aa73a6419aa34a22de7180039 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580 WHIRLPOOL 9879174bc3a7c8ece156c822b7a7b870908e51335702a78e6f04ea1496125a2018a879bfc53d1302e4825138d22af526308ba7f656d683a535be44d4515f1bac
 DIST wine-staging-2.1.tar.gz 10101781 SHA256 1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b SHA512 c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db WHIRLPOOL ecf970ef436089bbcd0088e1608b22e808d54560e905c7d8046b3e21508166a595c3ef7b69819c45e4b13183bd9134a2bd7016d29c4da52985701d392eb35a0a
@@ -20,3 +22,4 @@ DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff975759
 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
 DIST wine-staging-2.5.tar.gz 10062025 SHA256 b5cf6fa38151ff47ab6d725077693b02b37bb07b2ab7fda55290bb1f63ac54ad SHA512 6ab981886776f624c6478230aad18870f55b7252f1c6df90bfe1a248f7ea76cbb181f8e0780fdd4bb5e3c589a785baa7cf126a2c838adf65db2a67f873ed1698 WHIRLPOOL 7045b1642a3b14e5a507854cb8bf910c7cfb3c64ada4ee3534175c75b03cd604206617a55fb870e47fb248a4db8a9ca2abc0b4688005c1c0de0d542fec8cbc57
 DIST wine-staging-2.6.tar.gz 10034709 SHA256 ff86ddcceb7f6857bd415db3842ddf216a5cb301452e2a08053a9378cbf5580a SHA512 dc199b5345985d261b708ac811b02253ab9fbc4966889f2382ce518d991fe43b7c771c1d56d055c6234c9329d5c571cd9cf0b16587b77124b9c46917ddd066d2 WHIRLPOOL 375f484c6c50645c605994eb08c38c649ca6c8b47430e2f2f285a63fc24eca81588d0496a8c32074f90e4ea8f4330f76854bf8874f042e27581a7eee19aedf98
+DIST wine-staging-2.7.tar.gz 10018082 SHA256 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee WHIRLPOOL 6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95
diff --git a/app-emulation/wine-any/wine-any-2.7.ebuild b/app-emulation/wine-any/wine-any-2.7.ebuild
new file mode 100644
index 000000000000..d5aa54de17b2
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-2.7.ebuild
@@ -0,0 +1,615 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+	D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging || use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+	if use d3d9; then
+		if use staging; then
+			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+		else
+			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		fi
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 55e823af5f20..efca6bce5f9a 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -5,6 +5,7 @@ DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
 DIST wine-2.5.tar.xz 18993176 SHA256 13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2 SHA512 7b6faf6d8aa3d41465ad93ebae055581136f736c7eb8b4c61682e5a05589c83a0ff2c85e0f9abbca016f31b6f1c1435617c4994f1913f715a8707ebee3f28467 WHIRLPOOL 5acd2ac65df5dee1c860ddca72b8df8e021a0b95a3a1870d15468ce4591d569fa15bf8a0a6d341bcd3a624d13d0affe5b0263e67f9dfcbbf3ae7b59218dcded9
 DIST wine-2.6.tar.xz 19023352 SHA256 e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 SHA512 2aa55413ac090e011725566d004e42ee46323cd4c6961b9faa63e3de422ba60bb657bf224a4d7e8aa712a8e26e11977d07acb7c088ffeef8c37310e8cc698970 WHIRLPOOL 82e6a06cc342c7d6eace64a97bae10cc39c120c5776170b059700542b8b6fef56be9a697f05b3bc21ae82621f4bf50f3ab478311c9a3a55d86ed7c0a009766b0
+DIST wine-2.7.tar.xz 19101108 SHA256 e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c SHA512 1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a WHIRLPOOL 133426a0313facc856eebad3d16d199948b780ce4c4561e5784845c119fe462b8942ed86fa5e823e729a997d704bd3c70f44a64ce3eef965b4f3eb92587dfa4d
 DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0945b990f74eba2b059e6206 SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1 WHIRLPOOL 53044c0a4b7159c3af75fc935d1ac45030e80dbfd70d787f64885ddc025cfcd62f724c3256e389a7fde680670e594101955f52301cf6b9bbf23ebc64552790c2
 DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
@@ -12,4 +13,5 @@ DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db4950
 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
 DIST wine-d3d9-2.5.tar.gz 48692 SHA256 8b28c16701ec1cefab11d41d00954a92a5ced9a63f1ede81e96f247d2f498f94 SHA512 8b5ebec6341f70ec977aabee35decbe2d22fe43e111c1fd6015066a2b0e4fd259cd964fdb79306a489be4406078cb1e241d90ed636222174ed4abcc8026e7d03 WHIRLPOOL d5fcc5fbea4c4a4900235d33cb5de8f2a7cbf2b51b1a5c47d75ab765aa88ce1f8f81a61eefe0a742a55bb2ca210747b345589628fd1020430e4d962319b1c6fe
 DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c159528745ff1063d617f31e2d SHA512 17df692df8ff3c1419258a3faf9ddacde67f185a797dce76cd07c07e6f4fa2040b981662d311329a80921c039bfba0da5fed3ee53f8c36e34eeaa92af1c7b755 WHIRLPOOL e614b4af0f3c92113617f533255fd67a4b322bdaf0939fb98e09bf77e3b0437cb2b813032e33300e45294a60d5c3586a302669c28c293e180c775666cddc2581
+DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b
 DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688 WHIRLPOOL e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild
new file mode 100644
index 000000000000..1591b6351dd5
--- /dev/null
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use d3d9; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+	if use d3d9; then
+		PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine register --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use d3d9; then
+			eselect wine deregister --d3d9 ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
index 04b4ba3e9f2f..ab1551ea5406 100644
--- a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
@@ -13,15 +13,9 @@ KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~p
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README )
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf \
 		$(use_enable debug)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index 1fae8381e52a..5e9656de27db 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,2 +1,3 @@
 DIST fetchcommandwrapper-0.7.1.tar.gz 3187 SHA256 083eab79afadeadc00e9ad1dce77a54511df1a1e7b48c61c886012b565eba066 SHA512 be1e382180606d527f85c2f45888373286687c2b521c66cb11ed90f05e107bb54cbfe83b0509bf52e31108db3a52b9089259c83e63cae3a1d25dbca583faaf74 WHIRLPOOL dd9bda47ba066fc5ccab658b8914627ab14e0914ccc00541486910e7e2acc974016dacd7e40f86d6782adce45e9948cece74d09611ca965cceb110a491fc650e
 DIST fetchcommandwrapper-0.7.2.tar.gz 3134 SHA256 0ccab9876c6d2ed15c972aa5287069e2f2c503b9b36f6246b15be12eb7ec05b8 SHA512 f268cbef691320106b3f929b0ab3b63085ffdd3e1988fbada2d37c6abcdf7e417758055fff503bb70490840dfde7704e87bb7434faa1d1115cc42729ad10de61 WHIRLPOOL 1c9f2a5681a49a62e06003811a7903d58c816f34a38acf2c424238af58f32e48b0181d034c6ed2b44dcf3e4438ba1a45feb82315e263f5638a5c9fffe2f4b6a3
+DIST fetchcommandwrapper-0.7.3.tar.gz 3431 SHA256 c10659ff6e4c95102683be4848bdca44746ea9f500a081b01f9a1dd28d3a3faf SHA512 df314331b66b89842285a175be686fe800de4a93ad382b72659429a62de02c4fc708d8964f766c7203c3c2aa838a684e808442d410d37ab9f8b9af8328442a51 WHIRLPOOL d041ed86901ea03bbe7d3ef34837ed040088ec168671c82431d376cd3d82143ba54f4b71b73c79c33b55998542c229ae9544faaa027e3e6e79378c7127acc809
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
new file mode 100644
index 000000000000..bf638f923ccf
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c7bf31e87b02..9fea3a507ba3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
 DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b
 DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37
 DIST mariadb-10.1.22.tar.gz 61542321 SHA256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce SHA512 cf02044b7531f83618eeb42bbddce7b761c6530d22fc69701b3efe7461a1e932510cee923aa59044dcf0bbb5a9edf7bc76d3568f300b648f4983848f5975f7b2 WHIRLPOOL b0637e3a267ef70a527f7b15da634158f6dd873c3f3f88f81d60855784325ced0557e76e8be71e24d0927cec4c081e4cbf816f0c465d8cc9d9ef0576572ab44e
+DIST mariadb-10.1.23.tar.gz 61772244 SHA256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf SHA512 338d016251038ef03d78744d93a2e21db6517e44f911512aaa3f34b52ddf6b2fc255783f8cacd63a7f89bc56eb728321c658b11f06718c83baf22109907149c6 WHIRLPOOL 2f1ae9e3dab858998cff8578b7ec8d1c0949a908a9872dc48c997ae2b233eba629d65594bf67ae145d911bb6bd8dcf3dab2778d3a0fbe74d8855805326ccee12
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.54.tar.gz 45765936 SHA256 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3 WHIRLPOOL 6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe
 DIST mariadb-5.5.55.tar.gz 45757922 SHA256 cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 SHA512 6fe725c997600009a7bb3dd0e78a4a94c370a07760c26cb124eee68aa81f859be159618cab782595e33aefecaf0401a6a1229f9acd847b8e2425cee069a2bc4e WHIRLPOOL 6984b35add26a65844f036e11f9db1fc2663300b23c8d60510bda789753189a339da8dbf463699eeb2a145d05a803fac92a3ba729c6866139f7867b8eb69cfc7
diff --git a/dev-db/mariadb/mariadb-10.1.23.ebuild b/dev-db/mariadb/mariadb-10.1.23.ebuild
new file mode 100644
index 000000000000..62d35d11d985
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.23.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170316-1355Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
+	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			sys-libs/zlib[minizip]
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	)
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log}
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		mysql-multilib-r1_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp ; do
+			mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+	retstatus_tests=$?
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || eerror "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index dfd13c972587..55d72a8c2f1d 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -11,6 +11,7 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
+  <flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag>
   <flag name="cluster">Add support for NDB clustering (deprecated)</flag>
   <flag name="community">Enables the community features from upstream.</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 2e6cfe34ee5e..4395e5f6f6ae 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1 +1,2 @@
 DIST gradle-3.3-all.zip 91388147 SHA256 71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3 WHIRLPOOL d2058d046137b507aecae0ac8ebdc719dc1e1c253162be1975ff9daaca04178398b7621c142ed467a8608bf99d952c1046306aeb3b96626bf70899d7213ba91b
+DIST gradle-3.4.1-all.zip 91604607 SHA256 ed7e9c8bb41bd10d4c9339c95b2f8b122f5bf13188bd90504a26e0f00b123b0d SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c WHIRLPOOL b2796d07b6d7f290bde18f46b36348fa6079d42647775e1d6c448c5ebfbb16fc38954da7083f1ce15d2beb7677308e783e4610d4c841e5dbfb49bff620126b24
diff --git a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
new file mode 100644
index 000000000000..c72fd357956f
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
+HOMEPAGE="http://www.gradle.org/"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+}
diff --git a/dev-lang/go/go-1.8.1.ebuild b/dev-lang/go/go-1.8.1.ebuild
index c529b3279ee6..7bd87301f7c4 100644
--- a/dev-lang/go/go-1.8.1.ebuild
+++ b/dev-lang/go/go-1.8.1.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 9cdaa50bf8c1..3a60171ab786 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,6 @@ DIST leatherman-0.10.2.tar.gz 423470 SHA256 eca6cf88a233bb6c21be2b2d3954763e523d
 DIST leatherman-0.11.0.tar.gz 423516 SHA256 b625b7e7c54495f60a9166e7da85d2fd70a877b3e4cd81bba9e67da51dd261cd SHA512 af1a985ad4fe84a38193282a35d01ba939a8e35854158083387829c45887a2cde6c15f426770771ad17c6088d405b29209b5e772b477803f1fc6537538581367 WHIRLPOOL 1c8dd17c8b093ff6425702b1f5757468f5f1d27006700d48a02295116cbf735ae10a006a260415a49a527773be2e7d2d4922a751a354edb741212ab62bf8ffb2
 DIST leatherman-0.11.1.tar.gz 423537 SHA256 3059ecd28ce8468e5d535a7e21eea4b0cdf6aabdaec71deab5e5d18b715ecf73 SHA512 aa46fdb18ec535e458ba9802792606dc6ff5aec47b22b25722ba2b11fcfcbb2bdeabc46d456fae3e106da435aca7b2f06197a0ea50845d9b190c1b7c088b5691 WHIRLPOOL 47a40c8f799f592fda3914ee0eb17b8888c583cf6f24add354257e765b7f9224726ffab0ddca9f47067641a20a324b5466cb7e25136e361bdaffa5c94aacd4cb
 DIST leatherman-0.11.2.tar.gz 423569 SHA256 a0d3b2308aaddfb31ed4d4bcccb52206c4ad7d5da332b5254d1a6c3223ae980b SHA512 eb73971661834beef49585d1f631523c03115d682ecaf3c18ff5f3004c604b1b3ca7e6533e2e8b69ad7222922cd9afb61cb6888e0db03474b43294f326e2d667 WHIRLPOOL 78c46bf0fd465f0b275707c64f15c959a62f98e48ccc4346e84a550c7e4162dcde057014a92e98cbdfef59a3170206b95ffd33f74ad27c0a20cabe18d5bae964
-DIST leatherman-0.12.0.tar.gz 423780 SHA256 e7c07546ecf1e43e9c1c2439b4dc904864771050fe8f00998ee9ac10ca333113 SHA512 f7bf0b0993ca5a444a4bd40a38d8cf9246721e9b9c574d8134d5cdbe5963794ae39d5881c930a74d22f17579bc129fcabf74b59cb1562b07b47542c5c23be8db WHIRLPOOL cac3171766d735f0558692b6a5911663474f88e34ec974a36b0ece7d55384281d0570b460eac63db19f20b2ec441637b6a66bd8259ea6e719a5c14f1e7559630
+DIST leatherman-0.12.1.tar.gz 423884 SHA256 656a49bdb1181932a8606b58dd19efd8cf428dd0ebbb4af619e3737f2131bdc0 SHA512 f93b6b0f1051507469bcb8d964cd38b238a269bf277f3b540d4b0e53700012aba3eefc8dc5656a4158ad55b8570ebdb09f528fb586621972b847e10305912ce4 WHIRLPOOL bb2ea8b025aa07b18c485e5d5b98cad035590cb2f13d59780b683a3c2003cfe676e160769e6293b185a8fb1c16c542e033fc10cb27ac6be705345d8c672b8e47
 DIST leatherman-0.9.0.tar.gz 392308 SHA256 8d79a998caa47047bfc52093e6a50618458b5c0aa502a6cf61f9fb7a6451c3bb SHA512 25c5edd58abad4e20d36ec7badb94aacc0f9a9e44200e710dcb3da116685396bba5b12ae806f9865e48d5d50c43a31486d8aa39fd853551ccf2c3eaa28859c8d WHIRLPOOL 492ae8971368a8c7e3527a875c8cb4a46d5a767b80b45d32b33fa2f1c66a7d2ea4825c923a6993b1147ac8e68bb111c682ef5315c13a11a68bd583b3423e6656
 DIST leatherman-0.9.4.tar.gz 418077 SHA256 a396514fef1ab5d14ebc745a9166ac4fcdf229e5378824302de751ef5ec2bee9 SHA512 c08401856f5afc1b9d48cf31fa3c037ee9f316f4356419785c021696dff4628bfde92318ad0e50faf83aa9b205ebd479bbb46379431811cfec1dcbd5c88021f7 WHIRLPOOL cdae73fc20e08603c81d98127f642e6720fae449f1f1fbb9ca591ffed051bb1efc5ba21ea93a041d9cc8c7c58844ed5fc7467f6e9107d325687609780e8e2a6d
diff --git a/dev-libs/leatherman/leatherman-0.12.0.ebuild b/dev-libs/leatherman/leatherman-0.12.1.ebuild
similarity index 100%
rename from dev-libs/leatherman/leatherman-0.12.0.ebuild
rename to dev-libs/leatherman/leatherman-0.12.1.ebuild
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index c911dab5b46d..f4499e0dd6fe 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -2,4 +2,4 @@ DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f
 DIST libnl-3.2.28-in6.patch.xz 6368 SHA256 0cbb8dc4e3cdc90a4a0608a26af1971d7c1c397bb5f089de8c8d640e57b7b631 SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead WHIRLPOOL 1f1ebfc06a0cf516202cee3aaee92d7ed584ec9633d48c23e666d40bf48d658cc27a00c9f8881a7e976e21fc66fb867e10cadd8a6c0c8826ff4fab712cb20f3d
 DIST libnl-3.2.28.tar.gz 941954 SHA256 cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 WHIRLPOOL ff49346ddc31105a300ebffc0e4d4956ac85ade5e92e884c62e696d7d4234d40e63cf4839e6b6fd2d98d2122662d36d3f41666391686a83c8bf966e53e22ed25
 DIST libnl-3.2.29.tar.gz 963681 SHA256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670 WHIRLPOOL 1273dcaee79ecfdca947110c5e7ff70947703b1b0fda43fdb7c74edd78c6938f675e9a586aaff8feefce56a1f3137cbc50d3626ac336e6afa2ca8cbd8627e6eb
-DIST libnl-3.3.0-rc1.tar.gz 933271 SHA256 426f69373191760174cb40cb1f9a811248a56f8962fe66cf22156a71685fd110 SHA512 8084a54efac0256f6badd438fb79512cc53ee5f6635c4f301d1f7b3cfdf326387176949ac368903109dda02f55589ed09cb8f3218ebac973457c6f2740951488 WHIRLPOOL b8db1d4f589d32f0da830dc934765c67087665ac58366265fc2f5d649178c161cfc41e2faf139859c9547c5b20f28bfff5875db9c51cbfe93df3ecc01c3d7f3e
+DIST libnl-3.3.0.tar.gz 933390 SHA256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 SHA512 3fc5d95b875605ab6378d2d454020c1276a6772205fa11bbd22eba9fd9ef1deb8c75347e5d4602f0ab7bf13bd66b418f5ef73ed05f18134f08638ce06eef622c WHIRLPOOL a6f7c066c9d05af807ed17babe1f39107d24b4b5ef44ca94e487543a39b0a2f1298fbf6448356fa3701c033fbff0df392945666c125f16246398d47a8c828f5b
diff --git a/dev-libs/libnl/libnl-3.3.0_rc1.ebuild b/dev-libs/libnl/libnl-3.3.0.ebuild
similarity index 100%
rename from dev-libs/libnl/libnl-3.3.0_rc1.ebuild
rename to dev-libs/libnl/libnl-3.3.0.ebuild
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index c4b69f9cd80d..d8384a3307b8 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,8 +1,5 @@
 DIST libressl-2.3.10.tar.gz 3015911 SHA256 2d0b5aade0c5ed31a3c194fad5f8dd71cdd218b70205342739d24a625a54c4d3 SHA512 c783a1923a03a9c7c5d77a16dd4f9c798374c50e332ee7bc94ad6d5c2e112fb3db1de987ce84b3aaf822a1f68f4385270fafd687870bc8b275cc581619cb1d1e WHIRLPOOL cbfb31375b767f74e73ff04078cd2ef0b23501900269770e9b540d9ee58714e1f87068b8c11799e62d78edc22eeb4e535c61c6db4a63f3f3b30ae90871a2269c
-DIST libressl-2.3.9.tar.gz 3014155 SHA256 a6ff13664eb13af6dba00259cfb55a306b32b7688feef520a52fc0f60b8196fc SHA512 3b0f27d419bc6f69d6fbde8f3b6e6abcda86591c0400e49e2d4327b834a3996fd7838a2cfa3a999c4e949e29f7d1ee319e26ee4c2b1a25b3fb4f07fe15345810 WHIRLPOOL 26dd4c09f114bc533aad6845bc2110d1aa400032dc20f0f496bc049e8866acb6b5157973f62fcd4047c742247aedc9f28ea2ee346ab19a07395ef27202422e44
-DIST libressl-2.4.4.tar.gz 3014463 SHA256 6fcfaf6934733ea1dcb2f6a4d459d9600e2f488793e51c2daf49b70518eebfd1 SHA512 3999e1a61d3e5f14fbce72fdb0089eaf1481fb20f8675a56b2ce8b5388cf7e1ef7d2f66d9593960b708037537053b47f87b2a7f820504213a756b21c34584fe4 WHIRLPOOL 8c3f2b78a31243f49a2e44ad2e43db6637465886652d164e290344fbe207479913a20d857514fd88cf0429131fb64ef2d31eefb178c362d779c400110e9605f1
 DIST libressl-2.4.5.tar.gz 3016462 SHA256 d300c4e358aee951af6dfd1684ef0c034758b47171544230f3ccf6ce24fe4347 SHA512 bdbd0fcb868e77e5fba26da7653fe6e7f7b5017455e1beb13e11b42b8db0742b9ca6442f0949adc91ddc1f53fb93549a6c0529795cd34db2bf887cbca2d33070 WHIRLPOOL 1caa2e18304ec86f15f73e935a586d774aaa3c4248970596a7fa869f718ef9d12f6211e2abdbee90af4e4f83dfba77b45b3529dcc1077fe71e26e3beecf38bbf
 DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
-DIST libressl-2.5.1.tar.gz 3266271 SHA256 f71ae0a824b78fb1a47ffa23c9c26e9d96c5c9b29234eacedce6b4c7740287cd SHA512 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9 WHIRLPOOL e31b487e9e88f372cd22db05e54e74900181120cf8c6105f5531658e7b467722680921f3630b8943ee0ec5f5777cb76a7ddc64e4d43f166903928aaa4f98509c
-DIST libressl-2.5.2.tar.gz 3277320 SHA256 0ffa7d70809284a4ac96e965918a61c1d7930bca865457a7db0ff0afc8201c82 SHA512 2c42b8bab40dfb517231d83456073c92a61210a83654f23bec1b5148bd7e3c0590f50244970ebf966e5e9582ea98289fe48c6f246d1d79e5d9facea2041e4faa WHIRLPOOL fc1dba52049779bf55a39a88abff8db8cfa3ba0d437dfacefa372d64e9859d7904848ba146a54064f70b79d0febea666757981ff4268699ac22a6cd8b5f3bc73
 DIST libressl-2.5.3.tar.gz 3285151 SHA256 14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 SHA512 e5ba2abb8a0835a025d2777d9c0e8e95813777af8167e322d8e5ae20485c32b628ced77141b156fd3619b65a5afae1a5bc90a7252166a9a54f7e3d23388b3bd0 WHIRLPOOL 687d2b0f2f4294bbc16022056cae7e9f1dd70f168aa087e5d12e4e0eb498b8df05de48c262e5c6b094ea4cbff68a3c74255f369029f377a91e0f34f23e2daf4a
+DIST libressl-2.5.4.tar.gz 3286042 SHA256 107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa SHA512 8ca86c14af0020c90bef4651892799864938dab9d898172269cb78bad5963314e064f2b4c46e6a04e0b85d1eddbd1840b734803c11ceec8fd6bb1290e0fe204c WHIRLPOOL f1cfb1b126759275172616eadbc40e20ae8bbc615bfa4e49e68b3c5a9f66e6503007531a2ff59df482ebf6902008b431ca5891d73e6c8887862f11e00f76b423
diff --git a/dev-libs/libressl/libressl-2.3.9.ebuild b/dev-libs/libressl/libressl-2.3.9.ebuild
deleted file mode 100644
index e3ded3206a34..000000000000
--- a/dev-libs/libressl/libressl-2.3.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/38"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.4.4.ebuild b/dev-libs/libressl/libressl-2.4.4.ebuild
deleted file mode 100644
index 26c4d398961e..000000000000
--- a/dev-libs/libressl/libressl-2.4.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/39"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.5.2.ebuild b/dev-libs/libressl/libressl-2.5.2.ebuild
deleted file mode 100644
index 320352af0002..000000000000
--- a/dev-libs/libressl/libressl-2.5.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/43"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.5.1.ebuild b/dev-libs/libressl/libressl-2.5.4.ebuild
similarity index 100%
rename from dev-libs/libressl/libressl-2.5.1.ebuild
rename to dev-libs/libressl/libressl-2.5.4.ebuild
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild
index e61b3b6a6f1d..ba28818f77f4 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides information about Classes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
deleted file mode 100644
index 216a5e391851..000000000000
--- a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SROMANOV
-MODULE_VERSION=1.07
-inherit perl-module
-
-DESCRIPTION="Pure-Perl OpenPGP-compatible PGP implementation"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-solaris"
-IUSE="test"
-
-# Core dependancies are:
-# >=Data-Buffer 0.04
-# MIME-Base64
-# Math-Pari
-# Compress-Zlib
-# LWP-UserAgent
-# URI-Escape
-
-RDEPEND="
-	>=dev-perl/Data-Buffer-0.04
-	virtual/perl-MIME-Base64
-	virtual/perl-Math-BigInt
-	virtual/perl-IO-Compress
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/Crypt-DSA
-	dev-perl/Crypt-RSA
-	dev-perl/File-HomeDir
-
-	dev-perl/Crypt-IDEA
-	virtual/perl-Digest-MD5
-
-	dev-perl/Crypt-DES_EDE3
-	dev-perl/Digest-SHA1
-
-	dev-perl/Crypt-Rijndael
-	dev-perl/Crypt-CAST5_PP
-	dev-perl/Crypt-RIPEMD160
-
-	dev-perl/Crypt-Blowfish
-	>=dev-perl/Crypt-Twofish-2.00
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Exception
-	)"
-
-SRC_TEST="do"
diff --git a/dev-perl/Crypt-OpenPGP/Manifest b/dev-perl/Crypt-OpenPGP/Manifest
index 113c997edc1c..048562ae7e21 100644
--- a/dev-perl/Crypt-OpenPGP/Manifest
+++ b/dev-perl/Crypt-OpenPGP/Manifest
@@ -1,2 +1 @@
-DIST Crypt-OpenPGP-1.07.tar.gz 141752 SHA256 57ba790d4833a3270b683ee7e76fd2ab45319859ba36ed6247db3d9a9536291b SHA512 ee18a38327d92dab0ade4d8cb3ef3b6f018f66eae133d4287e863593031280dc97551a25d47cd6c82a4ef5be361aa8701eaf673e63c3bcf25c33dd21a89ce420 WHIRLPOOL 8d4656b9da1077eeb2efb5869a007e6917808e35a33dcdef4382f4d4ba4dd7dd67608a12e739d2d17ee20ebedc2cbba5e4c92d1169ac31687cd684a00b1892cd
 DIST Crypt-OpenPGP-1.12.tar.gz 103125 SHA256 e8a7ff2a993b76a69ad6dffdbe55755be5678b84e6ec494dcd9ab966f766f50e SHA512 7cbdd1e125d686aea6e6de66572e3d2d03f08d048481b757b9fa51f7d3d0b39dce1f4105a18600b4d546001bf39baeefb199c25449be21d038685cb21174caf6 WHIRLPOOL edeb59c53591b53d578b36b235595f3781be15e1836a5a8c62dd7049b81053a089aa07bcfed06dbb9bd2735be27543be5bbeafbfbfe1096ed2959f292fc70584
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
index 2d77c985c956..45b5aec57e8a 100644
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight HTTP Server"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
index 78e950e5b3e7..f0258b798028 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
index 1bd85f3880cc..ad61e3512299 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 # See MoreUtils.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
index c3928c33d6a5..f17d088db6cb 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lets you build groups of accessors"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
index 0078c2f73a6c..9800f692b33e 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
index fe2ec999e4b5..3fa72c9f1bc4 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
index fc795b8ae154..6423c3fe3ef0 100644
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-php/phpunit/files/autoload.php b/dev-php/phpunit/files/autoload.php
index 69ffa07bab95..f33b4c8881a1 100644
--- a/dev-php/phpunit/files/autoload.php
+++ b/dev-php/phpunit/files/autoload.php
@@ -1,8 +1,10 @@
 <?php
 /* Autoloader for dev-php/phpunit and its dependencies */
 
+$include_dir = '/usr/share/php';
+
 if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+    require_once "${include_dir}/Fedora/Autoloader/autoload.php";
 }
 
 \Fedora\Autoloader\Autoload::addClassMap(
@@ -144,24 +146,25 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 	'phpunit_util_type' => '/Util/Type.php',
 	'phpunit_util_xml' => '/Util/XML.php',
 ),
-  '/usr/share/php/PHPUnit'
+  "${include_dir}/PHPUnit"
 );
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(
-  '/usr/share/php/File/Iterator/autoload.php',
-  '/usr/share/php/PHP/CodeCoverage/autoload.php',
-  '/usr/share/php/PHP/Timer/autoload.php',
-  '/usr/share/php/SebastianBergmann/Version/autoload.php',
-  '/usr/share/php/SebastianBergmann/Diff/autoload.php',
-  '/usr/share/php/SebastianBergmann/Environment/autoload.php',
-  '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
-  '/usr/share/php/SebastianBergmann/GlobalState/autoload.php',
-  '/usr/share/php/SebastianBergmann/Comparator/autoload.php',
-  '/usr/share/php/SebastianBergmann/ResourceOperations/autoload.php',
-  '/usr/share/php/Symfony/Component/Yaml/autoload.php',
-  '/usr/share/php/Text/Template/autoload.php',
-  '/usr/share/php/myclabs/DeepCopy/autoload.php',
-  '/usr/share/php/PHPUnit/Framework/MockObject/autoload.php',
-  '/usr/share/php/phpspec/Prophecy/autoload.php',
+  "${include_dir}/File/Iterator/autoload.php",
+  "${include_dir}/PHP/CodeCoverage/autoload.php",
+  "${include_dir}/PHP/Timer/autoload.php",
+  "${include_dir}/SebastianBergmann/Version/autoload.php",
+  "${include_dir}/SebastianBergmann/Diff/autoload.php",
+  "${include_dir}/SebastianBergmann/Environment/autoload.php",
+  "${include_dir}/SebastianBergmann/Exporter/autoload.php",
+  "${include_dir}/SebastianBergmann/GlobalState/autoload.php",
+  "${include_dir}/SebastianBergmann/Comparator/autoload.php",
+  "${include_dir}/SebastianBergmann/ObjectEnumerator/autoload.php",
+  "${include_dir}/SebastianBergmann/ResourceOperations/autoload.php",
+  "${include_dir}/Symfony/Component/Yaml/autoload.php",
+  "${include_dir}/Text/Template/autoload.php",
+  "${include_dir}/myclabs/DeepCopy/autoload.php",
+  "${include_dir}/PHPUnit/Framework/MockObject/autoload.php",
+  "${include_dir}/phpspec/Prophecy/autoload.php",
 ));
diff --git a/dev-php/phpunit/phpunit-5.7.15.ebuild b/dev-php/phpunit/phpunit-5.7.15-r1.ebuild
similarity index 100%
rename from dev-php/phpunit/phpunit-5.7.15.ebuild
rename to dev-php/phpunit/phpunit-5.7.15-r1.ebuild
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
index 2ac1c0770ec1..e29e8a3ee7a2 100644
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@@ -1 +1 @@
-DIST symfony-config-2.8.19.tar.gz 52568 SHA256 0804dde6ea36afe5f428f838288e22bb8e02e123b970f2ae2f3fef1f18f0f294 SHA512 00d89ec1c78245429652ed48639fe54188c9cafcb7d3cc7978054d26d2e6be44addc738750575a134644b7b9735e805e95cb2890e9c4063dc7359e3b12da6942 WHIRLPOOL eae0fae487163864017097c3172ae151617818ed363618f0df66b12e4d371240609e39ed4446cf5a94da99a08ed8d0120677fd71d3e49a7f55502a41ad055bfb
+DIST symfony-config-2.8.20.tar.gz 52587 SHA256 19f54b4fc33666872ef1e66c0b3269cfc5b634808b61984d791ec399ef1d815e SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675 WHIRLPOOL 61ed346ae004c0ce8037e5c4ceb4d519af9fda6f09e2d533672ee0040c13fa15c53b2abe49f3fba32b827af058b6047200b5c812a2dccf56b7bece812bdeb0ed
diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php
index 4cbfc168d793..6c6f5c501beb 100644
--- a/dev-php/symfony-config/files/autoload.php
+++ b/dev-php/symfony-config/files/autoload.php
@@ -9,7 +9,12 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__);
 
-// Dependencies
+// Required dependencies.
 \Fedora\Autoloader\Dependencies::required(array(
   "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
 ));
+
+// Optional dependencies.
+\Fedora\Autoloader\Dependencies::optional(array(
+  "${vendor_dir}/PHPUnit/vendor/autoload.php"
+));
diff --git a/dev-php/symfony-config/symfony-config-2.8.19.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
similarity index 66%
rename from dev-php/symfony-config/symfony-config-2.8.19.ebuild
rename to dev-php/symfony-config/symfony-config-2.8.20.ebuild
index b53316b5174d..0daa831d25f0 100644
--- a/dev-php/symfony-config/symfony-config-2.8.19.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@@ -5,29 +5,25 @@ EAPI=6
 
 DESCRIPTION="Symfony Config Component"
 HOMEPAGE="https://github.com/symfony/config"
-SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz -> symfony-config-${PV}.tar.gz"
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz
+	-> symfony-config-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# This needs a newer phpunit and a modified autoload.php but should work.
-RESTRICT=test
-
 RDEPEND="
 	dev-lang/php:*
 	dev-php/fedora-autoloader
 	dev-php/symfony-filesystem"
-DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
+DEPEND="test? (	${RDEPEND} >=dev-php/phpunit-5.7.15 )"
 
 S="${WORKDIR}/config-${PV}"
 
 src_prepare() {
 	default
 	if use test; then
-		# Not quite right: we need to include PHPUnit's autoload.php as
-		# part of ours for the test suite to work.
 		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
 	fi
 }
@@ -39,5 +35,5 @@ src_install() {
 }
 
 src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
 }
diff --git a/dev-python/APScheduler/APScheduler-3.3.1.ebuild b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
new file mode 100644
index 000000000000..f6de479066c2
--- /dev/null
+++ b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://bitbucket.org/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 3 known failures due to caplog.set_level not existing
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 4b70e43bc2f1..5db28109e5fb 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,2 +1,3 @@
 DIST APScheduler-3.1.0.tar.gz 79124 SHA256 96a7ca40dbfb16502b44740c31c935943532f5a13be114e75419ca86fa264486 SHA512 8f8b1a997dffd8ebc090113f3edd6ba1c18514e2583e1bca52ed54b28c7965d146e082fa64de968f44b18b39aa5ead7e3114e3e049102aaab35c52245f37497c WHIRLPOOL d18137ad77485e4ae9439c344b7c53c03b9d3e474aa813891e48005c1e5784b7c85d358561dbc31e5be3cbc583ba56694f726ad4e2f80b3039c9b1ad231b4964
 DIST APScheduler-3.2.0.tar.gz 80946 SHA256 5baa1195ba711868fae257612cf80372ff1124014ca896884bf132f75636f638 SHA512 451e03e01a5b01126c8ab21acb6b053099271056372a5a66cf302a6aac02f5d4d9b033a0551d1029d82dee32b74db01518fc21c8bc718bbd38cf6417f68234e0 WHIRLPOOL 6effe49733a384b9e020f74ed7882972022a97c66584c56da87e769d34770705e9db5df2c51b8d90b5e45b5c90ee5a4b4483803526e2f90f03c60dd175f3bac5
+DIST APScheduler-3.3.1.tar.gz 84198 SHA256 f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd WHIRLPOOL 7e0f9b20722956f1982393fcf65b89f03a563893406878ecead33b09a034f1bbff6f9073ca4db52433504b4acbfc7dd7d27118531e506db2eae9614d472039ce
diff --git a/dev-python/Babel/Babel-2.0.ebuild b/dev-python/Babel/Babel-2.0.ebuild
deleted file mode 100644
index 3ea6b719e604..000000000000
--- a/dev-python/Babel/Babel-2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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
-}
diff --git a/dev-python/Babel/Babel-2.2.0.ebuild b/dev-python/Babel/Babel-2.2.0.ebuild
deleted file mode 100644
index b44486d36161..000000000000
--- a/dev-python/Babel/Babel-2.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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
-}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 10303d498dce..1cdd76ab556d 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,4 +1,2 @@
-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
-DIST Babel-2.2.0.tar.gz 6334150 SHA256 d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f SHA512 99771f8d34303f977858926ae70f4f3a5e0a0cd7e223a7f9e64364bfd2837356daf0676b06edf7cc11913f41d973bd41e7dcf5afac0f34aca0bf7558acf93802 WHIRLPOOL 7e0c8e2e78fbae776519ea8fd802806c66d7a13426a3de9b6bd1c16c07358fe7c8dd3991c88912570e27337ec8a192a753f9ef687524a398a376a401b286fd81
 DIST Babel-2.3.4.tar.gz 6866920 SHA256 c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5 WHIRLPOOL ea265abb1a9f6de890c6fa8e78ef49eab2adbd47916f30d19d3d807220c6598c14a93527ba85b92b8e6fbc40571c706cf233d17d7ee65448e3270ead38b7c71a
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index d791fc8a4ae9..adc3dd3be9bd 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,3 +1,2 @@
 DIST PyContracts-1.7.15.tar.gz 89602 SHA256 24bf3ab5cfd61d0e296af82fb8b73ba875ea09733a8ca562f53016cf980dc469 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717 WHIRLPOOL 268726b54025833e2667377de06d137bda671b777c29c35339ee6c71a8adc2cd8152c1dadd782a210fb89cc7529b84a80c7a3ffc39144462bc4949197226c6e1
-DIST PyContracts-1.7.6.tar.gz 58711 SHA256 94814b376b168483edeee33fdf1a04d892065d0bdfe0638d281c285d1f3e42bf SHA512 6c76e9f04e3553b2212749bb135351860d8a6e35e13f4a35f65bf7acfa14e031fec005b1f462f9948162cfcd60f4dce7d11d7fa30cb800ce199a0bf4f3b1c472 WHIRLPOOL 52da995c03bc1cb0c2dbdeaa00cbcb35e621b69a16ee0f5630207a62cca0a058d26d90acde4db6c22e785e60f9f4387caf935fac2af2e8e305d016e52a77f507
 DIST PyContracts-1.7.9.tar.gz 61033 SHA256 0ebb8c434700d1a990bd4f53dbbf1caec297b3a783c9af26de052104fe4dac65 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50 WHIRLPOOL 520a0836e1f65e389e1c09f74e52ddf2ab42c315de25cda34cb31332de245309fd38649fd30a6ee737a6e3ec189d3241340747ed111e3b84b92325bc5d22a9cf
diff --git a/dev-python/PyContracts/PyContracts-1.7.6.ebuild b/dev-python/PyContracts/PyContracts-1.7.6.ebuild
deleted file mode 100644
index 80e9744f1968..000000000000
--- a/dev-python/PyContracts/PyContracts-1.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Upstream allows tests to fail
-RESTRICT=test
-
-python_test() {
-	nosetests \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index c46e2eb7c6e9..1152b9e1b5bc 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,6 +1,2 @@
 DIST PySocks-1.5.6.tar.gz 9189 SHA256 a62b35b13968ba3642a973d115ae6a11be886b5f5ae0841a3ecad4b4f1d7deb1 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49 WHIRLPOOL fd2b797c863aef1258b7f3e9f8e1abfa83df8d9387274f084cf731e5ae7b5d01230eb793d5d0f60734bdf178761eaec47a6c87634943c90f6a1fab7cca9d82df
-DIST PySocks-1.5.7.tar.gz 32480 SHA256 e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88 SHA512 adcb504b938dacb3c5bd5bd28a9f2cd8311bb188dea1a1b65de13ef0b2b00af498a0e44280fff1ceaca4fed95281c070a13866cf13ee898cb564b4ef215ac4a4 WHIRLPOOL 57c9ebc6577b6fdcf883fed8cc5957330eb6848ec7c1bf164a34829832e17492bb9df433bacd9852ea4003d509c19108d5b540db918cf30322e2511fc567b336
-DIST PySocks-1.6.4.tar.gz 17172 SHA256 07f25f0720983462d5992c44a8288b54261e0055317535fbd8d96fe0c391817e SHA512 54992bb489ea8b559a3a844da1bd0a2b772ab84361f9f466e5b7cc8bc566ae9a01e8c9c0cc6ce914fb63b24d822aab8842cf10ad51d4c6233a5433d4a353b335 WHIRLPOOL 0f5d0255df3a1fa8a330f87fea0d546fc0b6d2554a9f5061dad349e5029ed4f1d4608860433bc353df07632467a298474cdf2418839b68d59376ec22a3c91176
-DIST PySocks-1.6.5.tar.gz 17212 SHA256 7962f4d7c76e8414ae168c677a77f19cf8926143911f7e8d37a5d4c4eb910c6f SHA512 19f0822afba1635d68cce327e1cd13203e3a2c39f92ae3817759de22ce3154899b97abe4760a3f0315b6af7757e116c8f7717b7948de179b16c065f743c845e2 WHIRLPOOL dea78f04e04006b691ad7f31af593076489c929fffeb5d6d631bfd69dd8e848936bb006eac1e32655bcbc84ec7ef18036d26716011552865abe279ae5b56ea9d
-DIST PySocks-1.6.6.tar.gz 282014 SHA256 02419a225ff5dcfc3c9695ef8fc9b4d8cc99658e650c6d4718d4c8f451e63f41 SHA512 f2989cb006cf804b713b29b7a317c54fff3ee4ed4b3dec81630f10e7bd26d41b2fe10058f3fcbf2ffff9888a3f7c0bd718e268dfd79e096c93a3bae355649f79 WHIRLPOOL 36db6d0335fc5ac96fece0d9bff282ea927304642155c93819be1d63fa46b638f9ec7a7bb67a1305c1a1560f82c7da9f0606ecd3a7214dd2f3bb20cd5935daf2
 DIST PySocks-1.6.7.tar.gz 282874 SHA256 d00329f27efa157db7efe3ca26fcd69033cd61f83822461ee3f8a353b48e33cf SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0 WHIRLPOOL c9c63030b90fce42cb9f3d5478d3fa201926c89258c1c6c1bb5b5077fcb799a8f7ed5c0246235b0b92304e831d3b7f4e50f94c0f19e1a025cb16015c8dc24811
diff --git a/dev-python/PySocks/PySocks-1.5.7.ebuild b/dev-python/PySocks/PySocks-1.5.7.ebuild
deleted file mode 100644
index 24893309ae08..000000000000
--- a/dev-python/PySocks/PySocks-1.5.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/PySocks/PySocks-1.6.4.ebuild b/dev-python/PySocks/PySocks-1.6.4.ebuild
deleted file mode 100644
index 24893309ae08..000000000000
--- a/dev-python/PySocks/PySocks-1.6.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/PySocks/PySocks-1.6.5.ebuild b/dev-python/PySocks/PySocks-1.6.5.ebuild
deleted file mode 100644
index 24893309ae08..000000000000
--- a/dev-python/PySocks/PySocks-1.6.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/PySocks/PySocks-1.6.6.ebuild b/dev-python/PySocks/PySocks-1.6.6.ebuild
deleted file mode 100644
index 335ee9b68eb8..000000000000
--- a/dev-python/PySocks/PySocks-1.6.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index d2c88752739f..b26e3d84fb6d 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1 @@
-DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812
-DIST alabaster-0.7.8.tar.gz 21030 SHA256 a1cb1b94fcc192ff74ca212d6ef5cb543bb169cfe7991c2b9df256bb354c1fff SHA512 43f159cfe5657b7b22dd9faed106ed8c9dca54d56a6cd850570a798cdc4919eba734457f75ecac293cd44efba83b2dd264fa903bbd8cbbe4939a7a211613dcd9 WHIRLPOOL 8dae4e88abef6b7e39fe0ea8aafdec5abf6345389d8d466011cd5454c8fce292b8a3d2d9cc58523632519abd9a69af600072f5a44ec75410f137a190edd64ce5
 DIST alabaster-0.7.9.tar.gz 10485 SHA256 47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8 WHIRLPOOL 01e49ebeedde34be62d4bea18da669120cae07ea803aee9c8d4eca8f8718ee60b20576475898859cd6bf82d75cb8207d4d3a7cc7dbe5e6809d75176dd8e8b681
diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild
deleted file mode 100644
index ec4da099d1a3..000000000000
--- a/dev-python/alabaster/alabaster-0.7.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} 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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.8.ebuild b/dev-python/alabaster/alabaster-0.7.8.ebuild
deleted file mode 100644
index cffbf9ca3e01..000000000000
--- a/dev-python/alabaster/alabaster-0.7.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index e2f8c92b4b59..f8818bf4c4a0 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,2 +1 @@
-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
diff --git a/dev-python/apipkg/apipkg-1.2-r1.ebuild b/dev-python/apipkg/apipkg-1.2-r1.ebuild
deleted file mode 100644
index 8bbab0da4050..000000000000
--- a/dev-python/apipkg/apipkg-1.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.python.org/pypi/apipkg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# https://bitbucket.org/hpk42/apipkg/issue/5/test-failure-with-python-34
-	sed -e 's:test_initpkg_not_transfers_not_existing_attrs:_&:' -i test_apipkg.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Bug 530388. The test requires patching to match py3.4; trivial.
-	py.test || die "Tests fail under ${EPYTHON}"
-}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 6d9c53feb684..1675f4e5b510 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,3 +1,2 @@
 DIST appdirs-1.4.0.tar.gz 14358 SHA256 8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5 SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac WHIRLPOOL 0e12bf1875e489fbfb2ed48b125917bb6e176b90051a0afe2b64f431bbd1f5be499b7c0631302513387c440a05b2eb067fefaf54141424c260834cba854b7e6f
-DIST appdirs-1.4.1.tar.gz 9486 SHA256 b45f2af7f028906134ad368d401bf51952554bcfa389e3c4feee50739dbc1642 SHA512 e228c2e6b7e09ec82997a7b2bf53137ac32d4dc9d085950b84fa03dbcf29b2ddb175fcb93fde7e65629dccd1f1d74c0e77d4b435563a79a7aa5f15ebb276c3bf WHIRLPOOL 38c092b5dbbcc999631ba88107a3321f4a6220c5890c6f8b9e491d8680eb3bc6492f3423133dedcde41990935901ae79edcaad2666207a6560a788a0518e6eaf
 DIST appdirs-1.4.3.tar.gz 9641 SHA256 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc WHIRLPOOL 4e88de235789556a220134c9b6cc1741d6fb65070c62e278c94585e3adc464562e3dc259340a8147b33de417e9533b7bc40cc66eb558d04ec3b197f5a092980e
diff --git a/dev-python/appdirs/appdirs-1.4.0-r1.ebuild b/dev-python/appdirs/appdirs-1.4.0-r1.ebuild
deleted file mode 100644
index d89a5a0e16bb..000000000000
--- a/dev-python/appdirs/appdirs-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# api.doctests is missing in the dist zipfile
-# and the 'internal' doctest does nothing
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-[[ ${PV} == 1.4.0 ]] || die "Please remove pkg_preinst from the ebuild"
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/appdirs/appdirs-1.4.1.ebuild b/dev-python/appdirs/appdirs-1.4.1.ebuild
deleted file mode 100644
index edebaddf6ff8..000000000000
--- a/dev-python/appdirs/appdirs-1.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-distutils.patch )
-
-python_test() {
-	"${PYTHON}" test/test_api.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/appdirs/files/appdirs-1.4.0-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.0-distutils.patch
deleted file mode 100644
index eb0cf8217545..000000000000
--- a/dev-python/appdirs/files/appdirs-1.4.0-distutils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Force setup.py to use distutils in order to break setuptools cyclic dependency.
-
---- appdirs-1.4.0/setup.py
-+++ appdirs-1.4.0/setup.py
-@@ -2,7 +2,7 @@
- import sys
- import os
- import os.path
--from setuptools import setup
-+from distutils.core import setup
- import appdirs
- 
- tests_require = []
-@@ -38,8 +38,6 @@
-         Programming Language :: Python :: 3.2
-         Topic :: Software Development :: Libraries :: Python Modules
-         """.split('\n') if c.strip()],
--    test_suite='test.test_api',
--    tests_require=tests_require,
-     keywords='application directory log cache user',
-     author='Trent Mick',
-     author_email='trentm@gmail.com',
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 49afa3d25a60..f77e427a34bd 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,5 +1,4 @@
 DIST BeautifulSoup-3.1.0.1.tar.gz 71460 SHA256 820a80f473240d9d30047f36c959d530a699a732500662dd8b03e1d3ccad12a8 SHA512 812969faf454a58d849921836ed07ec9a950f34fb31e29e118cdf1a75a533370e430f417402b5a5016d23b2d3a1c44a1cf5fde5b3bfd1bc98c50036edd51c0d6 WHIRLPOOL a199585817dcabcc6327c3836a66128605ebf92a6663b5c660125061a797485a504d300791bcd43e0e94e4f08ca59c01f65f42481da07b1240350cbfc6ea6b0c
 DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26
-DIST beautifulsoup4-4.3.2.tar.gz 143356 SHA256 a2b29bd048ca2fe54a046b29770964738872a9747003a371344a93eedf7ad58e SHA512 3d55e553a1a2109378e2961a0feb23a8f038f4ff7bd335a21a26d588d39761f6735888e6ca2d001587e9a6a3b8259a1a09b92b310aa17e9b76fd85601a1ca592 WHIRLPOOL 3570395aa0fae03edc1de10b1c41e82efefa4753c306d2619032b124536a72b6db696c7f85c6a7c32b18c0506ec33d4c8a2fb73660264ad5afd92aba76f32884
 DIST beautifulsoup4-4.5.1.tar.gz 158039 SHA256 3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f WHIRLPOOL bf971596707c2ff69e93528164be01254258aa45601763c543246b67c5d31024b0e4de618382775a3cf313d255d8d1d6268a47542773531aacee9a2643412661
 DIST beautifulsoup4-4.5.3.tar.gz 159185 SHA256 b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e SHA512 d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84 WHIRLPOOL f8dbffd8e4a1dbee0a7ad8a4bcbe22a984f524474f0241a4c03ef5c37b291f9834a6ff1d076421c0cf1087588df1e49f5b99cd9afd7e81591c9063d92d4d097d
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.3.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.3.2.ebuild
deleted file mode 100644
index 543d977938c4..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
-	https://pypi.python.org/pypi/beautifulsoup4"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-# new html5 awaits keywording of html5lib in Bug 471002
-IUSE="doc test"
-# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy pypy2_0)] )
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/lxml[$(python_gen_usedep 'python{2_6,2_7}' 'python3*')] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=doc/build/html/.
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index b7531ec2f076..2d6d96648f09 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,2 +1 @@
-DIST bleach-1.4.3.tar.gz 18094 SHA256 1293061adb5a9eebb7b260516e691785ac08cc1646c8976aeda7db9dbb1c6f4b SHA512 316450f6325c4fba78de97ba755c185d59aa4d112f303d9f630918f02e613170c2e6bc6ce2de73ce3b0000572de673ab0e0dddbe41da59de5f4cebbfa1348a14 WHIRLPOOL 48a591bdd5b2b91ccc9fa1efe3eb59215d06aa9fa8cb2efeaa352afd5f62e0002185ad99745814c7622e3e7f9645c159267f12e43752df7eed5726a3d01de2f6
 DIST bleach-1.5.0.tar.gz 36502 SHA256 978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124 WHIRLPOOL 9003f026686cd4fbff6c12c16359114df7414ca7e9363ed16197137aea8da43aa8374ddd6f0f26258ac89d4edcb7a82b2a252cde031432e6770781116c2f8e4e
diff --git a/dev-python/bleach/bleach-1.4.3.ebuild b/dev-python/bleach/bleach-1.4.3.ebuild
deleted file mode 100644
index 6c47f7d46dd4..000000000000
--- a/dev-python/bleach/bleach-1.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/nose-1.3[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 65f77de7d29b..8e039934f0f9 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1 +1,2 @@
 DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7
+DIST cachetools-2.0.0.tar.gz 18592 SHA256 715a7202240dc20dbe83abdb2d804d543e2d4f07af146f53c82166bd75f3a628 SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d WHIRLPOOL 1ea550d341b6586381b83b672eac41411b041a04ee579d5424215d69d0a3ac603f79b98165d97100abf64ee1e15aab100cbb0c50082a0ad65446e5b552d34e23
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
new file mode 100644
index 000000000000..00dbf57d16c4
--- /dev/null
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index a6af0800cc05..093e734bcab2 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1 @@
-DIST capturer-2.1.1.tar.gz 17404 SHA256 6d892baca28c32ba912d96dfc5d40972090437d7d8d1738453969a0700a272e4 SHA512 44442da3cfffaff0b5bf4ec71c189d8a5f3436d5e13f2b20a3c26ff02f740144cabf7c7de7a2dd606f056a262f71d7092cdb677062e2ea912f542da2011f00f7 WHIRLPOOL b50ccc40be42508255390bcd0a52e610ffcc9ce7d59a39c426937e81d85e3c1c009b4f0ddc057a44e0b591d54d0c55e70c35740f095f514313b3bd3f414d15b5
-DIST capturer-2.1.tar.gz 17380 SHA256 6837c34651d50615e20281a1cc73a2b363bb7b7c9451003d08ea481a58a6bbb8 SHA512 30325a4908b63cdc63439fe2dab360f37db1f335d44ba10cf03294513cf2ffd6688843659d16b6c96bca44440fbbf607b8b20c5031ee99b8973a26460e37ff72 WHIRLPOOL 47a3f37e200c4c7100baba4acc0dd3bf443e634b4d85d25e50e09a7db28477966a0247c85e0365d0b53d74c5247d4d0fcfc455ca77e5d0c743f410e61d6c588f
 DIST capturer-2.3.tar.gz 18380 SHA256 3e4a1edbe96275e33bdf5836fe5c244202bc7acbc675dce73b0f082240cacb69 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470 WHIRLPOOL 59d84da0b34740381ff138d8179a75f025b3ecb2714ff1255a4cef294d8ec42fea81fd02d392874d0b09bd1d0ed00186fbb9db1e7a431c7a4d5d4ebdabbc8a38
diff --git a/dev-python/capturer/capturer-2.1.1.ebuild b/dev-python/capturer/capturer-2.1.1.ebuild
deleted file mode 100644
index a5350a6dc48c..000000000000
--- a/dev-python/capturer/capturer-2.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# Test fails only ebuild, but works manually
-# Can't find out what it is
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/capturer/capturer-2.1.ebuild b/dev-python/capturer/capturer-2.1.ebuild
deleted file mode 100644
index a5350a6dc48c..000000000000
--- a/dev-python/capturer/capturer-2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# Test fails only ebuild, but works manually
-# Can't find out what it is
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index a3b5a4b88213..4babd3e42d7a 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,7 +1,3 @@
 DIST cffi-1.10.0.tar.gz 418131 SHA256 b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5 SHA512 02c9987c44698708dcb7e0aa17637df6b15f81732dc25b03e54563ca5664a817863b87daf7a782a62c7b6150388cdca858ef496a975ab289c86f05e5492465ef WHIRLPOOL 577cd975c6937537184b19432d185461964e5b66e851b1e3c4a8a3cc4a6a3329689dc15da717fb1921380af7479ca4dc9cb98c92a3763fe982abc582c012f474
-DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d
 DIST cffi-1.5.2.tar.gz 388793 SHA256 da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd SHA512 3c707db85032bc13287beec0211d85a7b9f9dfcb87844adba3a86b23211acd495e88072ec23f22e7c7626d25cadd5b9843c34255d4080eefb171020ad0a2d552 WHIRLPOOL 35cfd86d06dcc2bb2a0e8e196f06d5df0eeaa6dd65d13dc4489284108fa596a88f46918c5b70e38584965290d141f5cbf0e2bcb469c3316cd1962109d77889dd
-DIST cffi-1.6.0.tar.gz 397024 SHA256 a7f75c4ef2362c0a0e54657add0a6c509fecbfa3b3807bc0925f5cb1c9f927db SHA512 95dc7fbca624b5474ff0182ff6e1d1c6b8b34ad19c4c22cabf847f7be6c47dc32a96b23165da1c28438a46a1e9f681341fe8b7304ba5618744c595c4ae364466 WHIRLPOOL a4faef6dfaa078a09abadbe2af6d589dcd36d94bcf07eb47cda1e18ae1d60a3d62d0d66240f717f09564b97565b495e71b77390fe4278afb978fa2c62d341684
-DIST cffi-1.7.0.tar.gz 400251 SHA256 6ed5dd6afd8361f34819c68aaebf9e8fc12b5a5893f91f50c9e50c8886bb60df SHA512 ce9439a219248b06a6f2d019324f4150576b5e4d853025d61d470105f95af2a6c2387080bfd0308c063ad756f34feead9a5958187d626524594dfe9a3adf7462 WHIRLPOOL 1d10ba1d5fe2dadfe239c2111e9eb08beeddb7b796e966dae642fbfef0d590737018e27e3036817a1b2f43d76d2526642022b0d2ebe97ce8fcf4a49c8006ea26
-DIST cffi-1.8.3.tar.gz 403766 SHA256 c321bd46faa7847261b89c0469569530cad5a41976bb6dba8202c0159f476568 SHA512 a5a5f62c9d8607a8477abc2c2c53dcbe2aa4cf964b0592d4db349cd35a199e69a84d6cf160973fb5ee736607fa6a41314e8ff0d84bef2ffe16c08f6071c15222 WHIRLPOOL 9ab2f3bf534f4c7b925f3617a109c31ed6591500c551e0c1cae2443b506fa5aea8a1b91b9c378646354effba3d12f0002727be0560359ed40eb3c8751a352c03
 DIST cffi-1.9.1.tar.gz 407108 SHA256 563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8 SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3 WHIRLPOOL 12f9c044b7552520e5fe373fe85b0437734cee79a3f9a7eb1ec107ee877c85830e7f5d327d4a4a9504176cdb207a44e169ab52896a78459f00af285fd660c106
diff --git a/dev-python/cffi/cffi-1.2.1.ebuild b/dev-python/cffi/cffi-1.2.1.ebuild
deleted file mode 100644
index 202e17861ad2..000000000000
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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_{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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# 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
-}
diff --git a/dev-python/cffi/cffi-1.6.0.ebuild b/dev-python/cffi/cffi-1.6.0.ebuild
deleted file mode 100644
index 56402bd42345..000000000000
--- a/dev-python/cffi/cffi-1.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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_{4,5,6} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# 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() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.7.0.ebuild b/dev-python/cffi/cffi-1.7.0.ebuild
deleted file mode 100644
index 56402bd42345..000000000000
--- a/dev-python/cffi/cffi-1.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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_{4,5,6} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# 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() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.8.3.ebuild b/dev-python/cffi/cffi-1.8.3.ebuild
deleted file mode 100644
index 56402bd42345..000000000000
--- a/dev-python/cffi/cffi-1.8.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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_{4,5,6} )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# 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() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 563d29e535f8..7769fe8ffda9 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,3 +1,2 @@
-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
 DIST chardet-3.0.2.tar.gz 1872630 SHA256 3b92afd82ddea09d30832fac141840d6569c34f27633e4ad273c66172246116f SHA512 9466e8bdd4d49ca51664fefa170e2887bebf17d017d49056a0efe9baef4dc58e2a9e0766d41c1fcb06254e1346021d1d86b1eb55d4b71a061da93ea830f1dfce WHIRLPOOL 4010a838619b3f04d1266bdee49e26169724f1c83c38a3a9cc081fc8f2166e46ecf9544bc25e276a7dec4af7a64f469a74aabc8ecdc745fd10d364db331ee704
diff --git a/dev-python/chardet/chardet-2.2.1.ebuild b/dev-python/chardet/chardet-2.2.1.ebuild
deleted file mode 100644
index 8a7b19a5c719..000000000000
--- a/dev-python/chardet/chardet-2.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index dcfd6de692f2..fcb648e58e91 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,3 +1 @@
-DIST coloredlogs-3.1.4.tar.gz 23038 SHA256 c906ef520d55b94ace4f0aad8625a89fc1d324f24ed2892cc1ac5d479183a14c SHA512 0ee97d0b0e12351c006686418b09a951c3f4c04b6533437e41ffd54f9c427c2b9e5a35c486a37c54565d7cb0c4150b1656a87fed5a86f3ed08b3cd2595d59bd5 WHIRLPOOL caeb81a34e2c832a0d75e8123bb0d9d7e9071269b44e103031ab31657225f43a578f4eb10c6f5aaccce24feba08460fceb8bce9e0bba8eb873df2daa65338fa0
-DIST coloredlogs-5.0.tar.gz 24933 SHA256 612354a11acd2e1d603c24fe7be21d736c53a23ad27f244cd9e3fdb4a99661d4 SHA512 f20a18779964b0bd4d48b51b6df81a57e3918f0097108510c50d27d88386ae89bc4e6abcb6263e757148c5094aa02edb6fe8829caecae13ed4fe7596db488763 WHIRLPOOL e23012b14689125ac09d3c16dfe32823e7f792030e3be77899f6aa8bbc1c757c23f9fd739907e67ae3a24304bda036e7e690f95ccf6e7793ca75379bff11f726
 DIST coloredlogs-6.1.tar.gz 28057 SHA256 4cc35158baab0a495736eca84020a1a29f8ea470b98133bb94aabd3212d7f3f7 SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405 WHIRLPOOL 71f8632736c0c280bd19d1662d9cebfa04c85e70058953f0ff88d5e45c0e9daa189447e9b2053cbf4293e1a3708ddaea6a2b51d7688b2182617a38a6b2cbcf1c
diff --git a/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild
deleted file mode 100644
index c7bdcd1fa97f..000000000000
--- a/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-5.0.ebuild b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
deleted file mode 100644
index c0eabfb857c4..000000000000
--- a/dev-python/coloredlogs/coloredlogs-5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	# Sandbox violations
-	sed \
-		-e 's:test_system_logging:_&:g' \
-		-i ${PN}/tests.py || die
-	esetup.py test
-}
diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest
index 3abace758fdb..a93ff54c3fd8 100644
--- a/dev-python/couchdb-python/Manifest
+++ b/dev-python/couchdb-python/Manifest
@@ -1,3 +1 @@
-DIST CouchDB-1.0.1.tar.gz 57630 SHA256 ed4d9dbb0a8085e709f8ab11e522c7241f58b554a4e900886225c139fa9a47dc SHA512 5c0ffef5ac3743adfb48ce9efd6af42a01d5d68d412f4d58051e627e97cad225f287d3afb7a5879e12a06503a79e6a5dc063acbf02bf613c736fef82241d2a4e WHIRLPOOL 790cc1d2563630c1cc0b8f80e47bca74bac0a16b0782207fafeb12c9351b5bcaf0c1aa2d78b851e4bc9e0f539b3a914901709fca1ed859c6af1cb0a77f178c21
-DIST CouchDB-1.0.tar.gz 56791 SHA256 f81de35433932e1d81b922d12119fe9b2435046db5dc53d1fb068a087c1fb264 SHA512 c328a9b027d24ee560ef592925a072a463852fdb7e8e93e1d6e740d7245181ba147985d610d6fd55f4790d7338e69470c44f574469e718eeb7b4163dfb6fc19a WHIRLPOOL 326be4bedd76ebbc5c9fd3cbdc52182230e0701372e75fa074a328633668e407528ccab7d3516b665be8587d131db4e7f7ba054cb6be2fca60b16265793f38c4
 DIST CouchDB-1.1.tar.gz 60839 SHA256 9503ea413956c33b5e2af248235afb5e0f011f33f816a32e872f8ff9b0a0e710 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f WHIRLPOOL 44f51ab1a2f05edd8cf2219ce6fb108d99264f4dd952cf71ae89030fe97c2adf54350ae7352271200be2861e4f1e33a199aa072cebd0e16d9f489b8657470f59
diff --git a/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild
deleted file mode 100644
index aa19c76404f1..000000000000
--- a/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="CouchDB"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library for working with CouchDB"
-HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-# Tests require connectivity to a couchdb server.
-# Re-enable when the ebuild is capable of starting a local couchdb
-# instance.
-RESTRICT=test
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/couchdb-python/couchdb-python-1.0.ebuild b/dev-python/couchdb-python/couchdb-python-1.0.ebuild
deleted file mode 100644
index ad7bc0252bf5..000000000000
--- a/dev-python/couchdb-python/couchdb-python-1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="CouchDB"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library for working with CouchDB"
-HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-# Tests require connectivity to a couchdb server.
-# Re-enable when the ebuild is capable of starting a local couchdb
-# instance.
-RESTRICT=test
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 693a86fcea23..3ba134db33cf 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,4 +1,2 @@
 DIST coverage-3.7.1.tar.gz 284735 SHA256 d1aea1c4aa61b8366d6a42dd3650622fbf9c634ed24eaf7f379c8b970e5ed44e SHA512 d198b06db938119fad8c13b9a7bbf018a5406c29327c943014e3b9b33ea85f0fbadaef6565fba26a461a3f1ee31f4cbfb42503420cc587c846ce499e80fd5133 WHIRLPOOL f07d239053bf357fe3dca7bec04d390db9b6610060fd848c9f15ea9de2f0a141d66e68cba5833a63bde860f4377c9029574e6ea7ed76ffe2fda332703e3100ab
-DIST coverage-4.0.3.tar.gz 354482 SHA256 85b1275b6d7a61ccc8024a4e9a4c9e896394776edce1a5d075ec116f91925462 SHA512 eeb4d91de7caeba0be5df18ad9c30ca3d7b738a0983cc76074f9be1d2030b7f2b4ed5244756ca9f508d770aab075248a7d3da4da65b45b2107ab0905774a46b7 WHIRLPOOL 2571f60afdd34250c5f64d424107f2027b145dc860f015d92e858198f9828c3e7acc49370e041aa31ddc94561e5ebec31e43d0c6a019bb46376b5908402ac482
-DIST coverage-4.1.tar.gz 370815 SHA256 41632b5e2c0ec510e4c0f1f0f02a702477d1f837693964390553539217c92b07 SHA512 3f8380b7d9639692b9782a52f3f8bf842b65f1ee893a1ffd6c0deb46fd4b3e25169a126f6090d845851575196863687aa43299871a92abde1f91e4b91a6c5ef6 WHIRLPOOL 7bd2e9ec0c8f9009e8a8ff3f99d4a6fc54c16fe6cad0f23bee6a7c2c1f2dc6a121145199c23c6a2fb3590d06344a89d018bf5038a36d36a464c0b3ef16cf49f4
 DIST coverage-4.2.tar.gz 359873 SHA256 e312776d3ef04632ec742ce2d2b7048b635073e0245e4f44dfe8b08cc50ac656 SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23 WHIRLPOOL b54816038c8137e49b5d11797357f2fabe0eb11c0f27bad60634081386cf04dab742e2fa4ab78c9473b14ecfe132e6ff31f550e629521a0056b0baebd4cce895
diff --git a/dev-python/coverage/coverage-4.0.3.ebuild b/dev-python/coverage/coverage-4.0.3.ebuild
deleted file mode 100644
index 5c26a2d32d7d..000000000000
--- a/dev-python/coverage/coverage-4.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
-	${PYTHON} "${S}"/igor.py test_with_tracer py || die
-	${PYTHON} "${S}"/igor.py test_with_tracer c || die
-}
diff --git a/dev-python/coverage/coverage-4.1.ebuild b/dev-python/coverage/coverage-4.1.ebuild
deleted file mode 100644
index 9da79bacc13b..000000000000
--- a/dev-python/coverage/coverage-4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-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="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
-	${PYTHON} "${S}"/igor.py test_with_tracer py || die
-	${PYTHON} "${S}"/igor.py test_with_tracer c || die
-}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 58f6718cfd3f..ba116b87d37f 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,4 +1,3 @@
-DIST cryptography_vectors-1.3.4.tar.gz 25820443 SHA256 4414bce0a3d7f0a3cdbf44da75ae5c7c586fd765c777d99023eb5a3ac58f0196 SHA512 5b93fb7c50b93449ab15f62943f944c352e3a375c3a89f494cdd34c5c317b8d435ca0079a74fc6a924a1fc235e3c9cdf0d50baf0905d6a7d6161c07aecefe3fe WHIRLPOOL ce2589f31bff099ab73bc33ca42a51bbb505f514623197fcfada375d29bb1bc33c6beca5759c57fb925b3ea68a106891e884328c55116487a4c10abfab9c6db9
 DIST cryptography_vectors-1.7.1.tar.gz 26652514 SHA256 47e91b70bbf6852cb96a478cb715ca9234e5ff049c1956088c45c9f738f955f4 SHA512 2edaa91198adcf5e2523ea8d3d25a8cd7df85e6f6c06618301f87af6f0133f5d4672721082205a9a3c0c648390ee772e6107eb6ba76e96649bc2832676df8283 WHIRLPOOL 56e880f97605676dab714ef36bdf93032772b28b977a2ea74101179a20f704645cdb2670613d68eff340149142323d6ef6adf1fe066fd31e85e5e0ccacec34d6
 DIST cryptography_vectors-1.7.2.tar.gz 26652633 SHA256 4be4eee8a11deee5c2f00e389b49de8ce2642130282d1cd0adffb2f7dbe0acdc SHA512 997aa703649cb4b1dc7df37ed2843a6c06a3871df3d1bcf9ebde6466c32103512225d668e6eee62c89e20b74a5885aa2974d82b2cbf3065a902d059268bf1137 WHIRLPOOL 41f9aad77f27c0a0c6bb14ac2b87606a2a316640369e1abccaab82b827759f9f67519b320fade72ea12c46ea4306e8fce4cd5604c9174d62f475d859199b52ac
 DIST cryptography_vectors-1.8.1.tar.gz 26653746 SHA256 2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6 SHA512 78cf2a50ebbf0b11c57a53ac683a7ee39f157c7ad04d6374cfe5448bc474964ef61f74d0edd63b5a6b871b4efacc0b3fb9ea8d6025a99567ad2e6a5ec744255d WHIRLPOOL e982e3ed38e2b2c6ba5de4f65d86e13360b6418cdfc2b6191d3b4ef63ed740f3a59de8386f45b21149f11801bccf85e500462c1138af06db2754ef29d11a5c6d
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.3.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.3.4.ebuild
deleted file mode 100644
index fcc54bf2b90f..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} 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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6392afcaddad..92d54933c97b 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,4 +1,3 @@
-DIST cryptography-1.3.4.tar.gz 384109 SHA256 423ff890c01be7c70dbfeaa967eeef5146f1a43a5f810ffdc07b178e48a105a9 SHA512 abbc027433658702d2331282c9f63d99ea2eb42f5cdfe066b2b0ae6d9b86a35e23891716bb2e9e2ca707aa0d38fb69cba22ec5d95d2b9073047444fdae7a9224 WHIRLPOOL 5bd007cfe304620a7237b0f63fbe87ab22bd1cc252941f4815398382122b1c56c5a22e2dc35ce86aba2c2b2d9403de3313bafde23a3695bd26e4eb0f23c9dea9
 DIST cryptography-1.7.1.tar.gz 420673 SHA256 953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40 WHIRLPOOL 24b705889b95b568000600662ec82e3f5571582525db3571f3285b99f985b0a21eefd14dccc577700bc082891f7d3c563ac78a8bfd8d810da3ff38914ae5a86d
 DIST cryptography-1.7.2.tar.gz 420867 SHA256 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 SHA512 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5 WHIRLPOOL 531265115a6573c54e2cf85a03f1ed0ebe033fd7818168a3bcda938458f9a32464d7de0c226f46a300635ee52e4995285889bb693bc56f77f816bc81d52bfc61
 DIST cryptography-1.8.1.tar.gz 423560 SHA256 323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190 SHA512 273c8ca4ad6c9d1151a8a731d148d02e619e14e37df25dc26030b0a90f895b88fbf4d3e320aec5ea7af4a8fcc58f720c61f48968f912c69156d4e0e794743345 WHIRLPOOL ff760c9dc7dfbba355afde726a9154bcf45102e135b95b431aab5ac34c8003edccafa646b51ca02296aa55f244b0ff752d8d1b775cb76a1c9f15d347d505e8ce
diff --git a/dev-python/cryptography/cryptography-1.3.4.ebuild b/dev-python/cryptography/cryptography-1.3.4.ebuild
deleted file mode 100644
index b2d90237b1bf..000000000000
--- a/dev-python/cryptography/cryptography-1.3.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc 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.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=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 )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch b/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch
deleted file mode 100644
index fbe690e83608..000000000000
--- a/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From df779dfec9ce87b79e48448aea3c597a4716b29e Mon Sep 17 00:00:00 2001
-From: Paul Kehrer <paul.l.kehrer@gmail.com>
-Date: Tue, 1 Mar 2016 14:22:32 -0600
-Subject: [PATCH] move BIO_new_mem_buf to macros to handle 1.0.2g signature
- change
-
----
- src/_cffi_src/openssl/bio.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
-index ac86683..6439e63 100644
---- a/src/_cffi_src/openssl/bio.py
-+++ b/src/_cffi_src/openssl/bio.py
-@@ -99,7 +99,6 @@
- BIO *BIO_next(BIO *);
- BIO *BIO_find_type(BIO *, int);
- BIO_METHOD *BIO_s_mem(void);
--BIO *BIO_new_mem_buf(void *, int);
- BIO_METHOD *BIO_s_file(void);
- BIO *BIO_new_file(const char *, const char *);
- BIO *BIO_new_fp(FILE *, int);
-@@ -127,6 +126,8 @@
- """
- 
- MACROS = """
-+/* BIO_new_mem_buf became const void * in 1.0.2g */
-+BIO *BIO_new_mem_buf(void *, int);
- long BIO_set_fd(BIO *, long, int);
- long BIO_get_fd(BIO *, char *);
- long BIO_set_mem_eof_return(BIO *, int);
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index e2b5850ce3d3..8af48e2c9dc3 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,4 +1,2 @@
 DIST cssselect-0.9.1.tar.gz 32952 SHA256 0535a7e27014874b27ae3a4d33e8749e345bdfa62766195208b7996bf1100682 SHA512 c4cd2c8d6fbfa99b836554685dd59e1e794e1fab06fcf4419a226b0608a05d58be5af54e507003f2a233a22f03d59d3d63c0bf19b3314f15c95ab3ce5f4db6cc WHIRLPOOL 0fabe49d4f504069eb782ba98c93a34fa9433fd4d10a545f46f5aa1a5fb3a898580f4e17d744052590e18fe7a0f06feca0527d86ac243282e826caddfb410324
-DIST cssselect-0.9.2.tar.gz 33065 SHA256 713b5b99ef08022257b3409c7ae1b18b2c6536b3f155e6237c5cfba0f67ae6f5 SHA512 313965d3a0ad37b24d72d6faf861c04e7af7e4ff06f58450a23585c45bd9f247e565a4b7d594c008d40625601c2b8e76919801b3d77cfd62c7edc20cf366c1f9 WHIRLPOOL 90907b0cbc799d9e7f00ea366a24101fa4ff84786add028a035a355b4e8ce2073da82dfc4bc3a8e9a058341e117887e5ea1bac0e3b4befd8ac5df1bbbb21a2ca
-DIST cssselect-1.0.0.tar.gz 22278 SHA256 582a85780249255707872c31d0438fc457aa24cfb43e472ff8f3e7ad6857953f SHA512 59b8ed898a2f5286f3d1be5b9bf2486f0b0cc372271d34098dbbc95696eb951bbb52e53810f9e20f0aab8e2a26c4eaf1905e1604f85287965bd4d105bb4b71fb WHIRLPOOL bcec8e04fa428c0ba54c0738d1864ff8128a65253777e5786a756b720c9a7087ff6eebab5cd48a695b2b2fc0ae9405330b4a1820dc2f4f1c926288f85d2ac7c1
 DIST cssselect-1.0.1.tar.gz 21849 SHA256 73db1c054b9348409e2862fc6c0dde5c4e4fbe4da64c5c5a9e05fbea45744077 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928 WHIRLPOOL e89bcbbd08ed35490d9e79e8d6f5c290e4a9e73dc7cdc2217324fb06e1e1bdc18a16c08dbbe8ca4407c0eb77b4c74ff3fbabf9b3307b94b66aae421d33ef8e29
diff --git a/dev-python/cssselect/cssselect-0.9.2.ebuild b/dev-python/cssselect/cssselect-0.9.2.ebuild
deleted file mode 100644
index f076649a71b6..000000000000
--- a/dev-python/cssselect/cssselect-0.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_prepare_all() {
-	# prevent non essential d'load of files in doc build
-	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc ; then
-		"${PYTHON}" setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cssselect/cssselect-1.0.0.ebuild b/dev-python/cssselect/cssselect-1.0.0.ebuild
deleted file mode 100644
index ee28e89b4d01..000000000000
--- a/dev-python/cssselect/cssselect-1.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-# No tests.py file in this release.
-# Please check on version bumps if it's still missing.
-RESTRICT="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_prepare_all() {
-	# prevent non essential d'load of files in doc build
-	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc ; then
-		"${PYTHON}" setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 1613634b4349..8f6e2dda957d 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,2 +1 @@
 DIST cycler-0.10.0.tar.gz 16553 SHA256 cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819 WHIRLPOOL 59c42f5b1d3fcf917cd19d8a9365614f07257d74135d8ee7dc231599bc600d1cf9e0c9a6e822c8aa1a932a31603e2a044b61143d648138e7e549d46a2f1b58f6
-DIST cycler-0.9.0.tar.gz 3472 SHA256 96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc SHA512 fc48d432eeeff4eb2f148cc3a07ac6affb422481d4d1405fbcb505442d64929ce1cfcbf4cac7e64ce3192b24991dadee591cd01ae8a6118e45d11d316064e6cb WHIRLPOOL 46cba5b7fe4a634ed1e847df90038da4fdeb0ce55ecc811a6adcb71f999417c862c79ff6499984c8bb6403e84f382984ffed6008fdd1b1807491adccc4d5499e
diff --git a/dev-python/cycler/cycler-0.9.0.ebuild b/dev-python/cycler/cycler-0.9.0.ebuild
deleted file mode 100644
index a0eb2c47da44..000000000000
--- a/dev-python/cycler/cycler-0.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-MY_PN="Cycler"
-
-DESCRIPTION="Composable style cycles"
-HOMEPAGE="
-	http://tacaswell.github.io/cycler/
-	https://pypi.python.org/pypi/Cycler/
-	https://github.com/matplotlib/cycler"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Not shipped
-# https://github.com/matplotlib/cycler/issues/21
-RESTRICT=test
-
-python_test() {
-	${PYTHON} run_tests.py || die
-}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index bba1eaee215e..b26ae287a8f1 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,4 +1,3 @@
 DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b
 DIST Cython-0.24.1.tar.gz 1703756 SHA256 84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9 SHA512 c5a3e884edd782c47c81aef29708035bbcd1c14d17e005668da8a4e26fdbba9af9ec283fd46ceaa2cab6fc4ec0d42f7d409832d7cc0a3ec00e84b968b1bf27ea WHIRLPOOL 14224a56c5a6f5cd3f389225c440c65b30a5d1b92c63587c4e9af258b23b1bed1c01330830931c5aba596649d19b0aafd0e559aed5ad7b577a59417463fc3b4a
-DIST Cython-0.25.1.tar.gz 1701919 SHA256 e0941455769335ec5afb17dee36dc3833b7edc2ae20a8ed5806c58215e4b6669 SHA512 cde26de8b7a626ee39e66223e5b9b3d6b2db182531da7c36f1d63bd720693e710f1976eaeaa4745e7a4b7872ec608ba4784569199303bcbabe1cc464da2ad913 WHIRLPOOL ff5176ab6433767af1f44a16d27d35c8bf12dcf6cadcb37372b118a1613855cfeb9b1786e6449d922df9ad6bef6873e4d818fbb36656eaf532468480b42a76e9
 DIST Cython-0.25.2.tar.gz 1703315 SHA256 f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306 SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1 WHIRLPOOL bb12d06fddb30d99527e3a62e8788b7aee92787aec9c46e927658f7ee60c8f3e32acb34b2deee1d0cf6ece7f4b06288008082ac609b8cb4b101a1348b1017865
diff --git a/dev-python/cython/cython-0.25.1.ebuild b/dev-python/cython/cython-0.25.1.ebuild
deleted file mode 100644
index 7599fb5e7e1f..000000000000
--- a/dev-python/cython/cython-0.25.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-# 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}] )"
-
-SITEFILE=50cython-gentoo.el
-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 emacs && elisp-compile Tools/cython-mode.el
-
-	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/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/docutils/docutils-0.12-r1.ebuild b/dev-python/docutils/docutils-0.12-r1.ebuild
deleted file mode 100644
index fd90096d6454..000000000000
--- a/dev-python/docutils/docutils-0.12-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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}"
-
-PATCHES=(
-	# Upstream patch to fix tests
-	"${FILESDIR}/${P}-fix-tests-pygments.patch"
-
-	# Patch to fix pypyp tests
-	"${FILESDIR}/${P}-fix-tests-pypy.patch"
-)
-
-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
-	"${EPYTHON}" 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
-	"${EPYTHON}" 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)
-}
diff --git a/dev-python/docutils/files/docutils-0.12-fix-tests-pygments.patch b/dev-python/docutils/files/docutils-0.12-fix-tests-pygments.patch
deleted file mode 100644
index 7a116187d4c8..000000000000
--- a/dev-python/docutils/files/docutils-0.12-fix-tests-pygments.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From c8329f1bca61c203b48f80f01876384a79cceab5 Mon Sep 17 00:00:00 2001
-From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
-Date: Sat, 14 May 2016 21:15:00 +0000
-Subject: [PATCH] Apply #131 (update pygments test to pygments 2.1) by
- cstratak.
-
-git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7936 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
----
- .../test_parsers/test_rst/test_directives/test_code.py     |  6 +++---
- .../test_rst/test_directives/test_code_long.py             |  2 +-
- docutils/test/test_parsers/test_rst/test_interpreted.py    | 14 +++++++-------
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/test/test_parsers/test_rst/test_directives/test_code.py b/test/test_parsers/test_rst/test_directives/test_code.py
-index 5e013d4..8affcbe 100644
---- a/test/test_parsers/test_rst/test_directives/test_code.py
-+++ b/test/test_parsers/test_rst/test_directives/test_code.py
-@@ -107,10 +107,10 @@ totest['code-parsing'] = [
-         <inline classes="keyword">
-             print
-          \n\
--        <inline classes="literal string">
-+        <inline classes="literal string single">
-             'hello world'
-          \n\
--        <inline classes="comment">
-+        <inline classes="comment single">
-             # to stdout
- """],
- ["""\
-@@ -155,7 +155,7 @@ totest['code-parsing'] = [
-         <inline classes="ln">
-             11 \n\
-             \n\
--        <inline classes="comment">
-+        <inline classes="comment single">
-             # and now for something completely different
-         \n\
-         <inline classes="ln">
-diff --git a/test/test_parsers/test_rst/test_directives/test_code_long.py b/test/test_parsers/test_rst/test_directives/test_code_long.py
-index f015357..e6430cc 100644
---- a/test/test_parsers/test_rst/test_directives/test_code_long.py
-+++ b/test/test_parsers/test_rst/test_directives/test_code_long.py
-@@ -60,7 +60,7 @@ totest['code-parsing-long'] = [
-         <inline classes="ln">
-             11 \n\
-             \n\
--        <inline classes="comment">
-+        <inline classes="comment single">
-             # and now for something completely different
-         \n\
-         <inline classes="ln">
-diff --git a/test/test_parsers/test_rst/test_interpreted.py b/test/test_parsers/test_rst/test_interpreted.py
-index f9a1194..87d0a77 100755
---- a/test/test_parsers/test_rst/test_interpreted.py
-+++ b/test/test_parsers/test_rst/test_interpreted.py
-@@ -119,30 +119,30 @@ totest['basics'] = [
-         :not a role if it contains whitespace:
- """],
- ["""\
--:title:`` (empty interpteted text not recognized)
-+:title:`` (empty interpreted text not recognized)
- """,
- """\
- <document source="test data">
-     <paragraph>
--        :title:`` (empty interpteted text not recognized)
-+        :title:`` (empty interpreted text not recognized)
- """],
- ["""\
--:title:`\ ` (interpteted text containing empty string)
-+:title:`\ ` (interpreted text containing empty string)
- """,
- """\
- <document source="test data">
-     <paragraph>
-         <title_reference>
--         (interpteted text containing empty string)
-+         (interpreted text containing empty string)
- """],
- ["""\
--`\ `:title: (interpteted text containing empty string (postfix))
-+`\ `:title: (interpreted text containing empty string (postfix))
- """,
- """\
- <document source="test data">
-     <paragraph>
-         <title_reference>
--         (interpteted text containing empty string (postfix))
-+         (interpreted text containing empty string (postfix))
- """],
- ["""\
- :title:`\ non-empty`
-@@ -283,7 +283,7 @@ Python code :python:`print("The end")`.
-                 print
-             <inline classes="punctuation">
-                 (
--            <inline classes="literal string">
-+            <inline classes="literal string double">
-                 "The end"
-             <inline classes="punctuation">
-                 )
--- 
-2.7.4.GIT
-
diff --git a/dev-python/docutils/files/docutils-0.12-fix-tests-pypy.patch b/dev-python/docutils/files/docutils-0.12-fix-tests-pypy.patch
deleted file mode 100644
index 7a29b8857910..000000000000
--- a/dev-python/docutils/files/docutils-0.12-fix-tests-pypy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/test/test_parsers/test_rst/test_directives/test_images.py b/test/test_parsers/test_rst/test_directives/test_images.py
-index ea3adfa..9743fba 100755
---- a/test/test_parsers/test_rst/test_directives/test_images.py
-+++ b/test/test_parsers/test_rst/test_directives/test_images.py
-@@ -277,7 +277,7 @@ totest['images'] = [
-         <literal_block xml:space="preserve">
-             .. image:: picture.png
-                :scale: fifty
--""" % DocutilsTestSupport.exception_data(int, "fifty")[1][0]],
-+""" % DocutilsTestSupport.exception_data(int, u"fifty")[1][0]],
- ["""\
- .. image:: picture.png
-    :scale: 50
-diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
-index 1200ab0..b75844a 100755
---- a/test/test_parsers/test_rst/test_directives/test_tables.py
-+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
-@@ -12,6 +12,7 @@ from __init__ import DocutilsTestSupport
- 
- import os, sys
- import csv
-+import platform
- from docutils.parsers.rst.directives import tables
- 
- 
-@@ -34,9 +35,14 @@ else:
- 
- # some error messages changed in Python 3.3:
- csv_eod_error_str = 'unexpected end of data'
--if sys.version_info < (3,2,4) and not (# backport to 2.7.4
--    sys.version_info[:2] == (2,7) and sys.version_info[2] > 3):
-+if sys.version_info < (3,2,4) and (
-+    # CPython has backported to 2.7.4, PyPy has not
-+    platform.python_implementation() == 'PyPy' or not (
-+    sys.version_info[:2] == (2,7) and sys.version_info[2] > 3)):
-     csv_eod_error_str = 'newline inside string'
-+# pypy adds a line number
-+if platform.python_implementation() == 'PyPy':
-+    csv_eod_error_str = 'line 1: ' + csv_eod_error_str
- csv_unknown_url = "'bogus.csv'"
- if sys.version_info < (3,3,2):
-     csv_unknown_url = "bogus.csv"
-@@ -782,7 +788,7 @@ u"""\
-                :widths: 0 0 0
-             \n\
-                some, csv, data
--""" % DocutilsTestSupport.exception_data(int, "y")[1][0]],
-+""" % DocutilsTestSupport.exception_data(int, u"y")[1][0]],
- ["""\
- .. csv-table:: good delimiter
-    :delim: /
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index abc672e5b903..78e9fc88534c 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,4 +1 @@
-DIST enum34-1.0.4.tar.gz 32944 SHA256 d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447 SHA512 21b91f1d0e15cc909e733473f603077eff7222c90da84b0a5f2db921ba41ac996b9237cc8adf1d07913b7eaf8f8e70ac6955abbb191f2e7cc54966710a1c96a9 WHIRLPOOL 178d1d5a9ec4e5a7a467e31c9b28e1f799e593e36a0c9a888f64ec86051277cb1c50ae01ed81c95cd3f7ae1e7f287dda9b4049c7e1977fcd427711fcf3990792
-DIST enum34-1.1.2.tar.gz 46757 SHA256 2475d7fcddf5951e92ff546972758802de5260bf409319a9f1934e6bbc8b1dc7 SHA512 61e47d27969237f5e0de814f42e8f9217147f3d2d3081a1fadaf665cee293af1dd978420fb918000ac9f0fe323249faf7993f204660acdebff880bca1dde2487 WHIRLPOOL 9c9a77a9ea042473032b77ade2d5faabf4d176a70fd1931c55d534eced5a2f0140a1c486d99445500e8ab304f14ec5eaa91bcf7a5ba238def557cb3de39f9840
-DIST enum34-1.1.3.tar.gz 39773 SHA256 865506c22462236b3a2e87a7d9587633e18470e7a93a79b594791de2d31e9bc8 SHA512 6ab07930a41a3a5f764dd38fe7e128dcc194b726b9a50286703de7cd7e16e433578cf331d29eca2472ee0659d461a80614db06f88c4f5da661a7d38863c4c23c WHIRLPOOL fdbec6f56d745d8e1228ddc096a0e6bf6d27db4ee9378fdda5716649edde312e1d9a10ebda6a62bf135451184e1bd729bf3e721fa73543a81f97855ae6134083
 DIST enum34-1.1.6.tar.gz 40048 SHA256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec WHIRLPOOL 856c6f81f33eb8f13b65e4124f1eaba79ed6b1ee69caf4200398b335a21019b2a54443bce87dd570db0282d2e17a1366010ac274795ce4cf78608271d934626d
diff --git a/dev-python/enum34/enum34-1.0.4.ebuild b/dev-python/enum34/enum34-1.0.4.ebuild
deleted file mode 100644
index 7fc67f0487d9..000000000000
--- a/dev-python/enum34/enum34-1.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )  # Do NOT add python3_4—see DESCRIPTION
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.python.org/pypi/enum34"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" enum/test_enum.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local DOCS=( enum/doc/. enum/README )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/enum34/enum34-1.1.2.ebuild b/dev-python/enum34/enum34-1.1.2.ebuild
deleted file mode 100644
index 3b16a4480fb9..000000000000
--- a/dev-python/enum34/enum34-1.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.python.org/pypi/enum34"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-python_test() {
-	"${PYTHON}" enum/test_enum.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local DOCS=( enum/doc/. enum/README )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/enum34/enum34-1.1.3.ebuild b/dev-python/enum34/enum34-1.1.3.ebuild
deleted file mode 100644
index 55a6dcdb6e56..000000000000
--- a/dev-python/enum34/enum34-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.python.org/pypi/enum34"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" enum/test.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local DOCS=( enum/doc/. enum/README )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index d1d93820b30d..0758701c7218 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,2 +1,3 @@
 DIST eventlet-0.18.4.tar.gz 288920 SHA256 74ef11d67ee5e85e009b0fced733c907620bca1ab8e6b0489d9f247405ab2685 SHA512 3098f2e8649b1e10157b9474571b372176b05263a7d5e7bb915b0464551d70505bbdf77dc072f64c1c05b3011406ae4814ea1b6f746cea766bb58827b1515fcc WHIRLPOOL 818fea5dec6532312068b9853a501d38bf4e69cca4e6e7ad6f6cbede9f9fe63237e3889ddb8b74d3d0e080b826d24532ed488687b60fc160a7e65d129ce2497f
 DIST eventlet-0.20.1.tar.gz 469509 SHA256 3ad581b8645a54acf436e62a4d8cbf229a1ec7bfa3287c160f0258826b297838 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734 WHIRLPOOL 729505cd16fdecdc323f2bb12f4b03a9f9dc63267db4a1f005ba266a8bd8f37707969a80e23ecd18b2cc6e247e71bff0c31d7a5096576c57e6c3c32dc050cf73
+DIST eventlet-0.21.0.tar.gz 484191 SHA256 08faffab88c1b08bd53ea28bf084a572c89f7e7648bd9d71e6116ac17a51a15d SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47 WHIRLPOOL 7dd13fe69aa5690001900ac34382cee8c2b0c112fa556a4b552543806d6e88992ef1a5dd6fb7307fa63bcf25e311727b6c979a6acb0e009fc488edd64e4d5e87
diff --git a/dev-python/eventlet/eventlet-0.21.0.ebuild b/dev-python/eventlet/eventlet-0.21.0.ebuild
new file mode 100644
index 000000000000..5a7b9ba37c08
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.21.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index fdf1a65c2184..aa51fef73b9d 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,2 +1 @@
-DIST execnet-1.2.0.tar.gz 163876 SHA256 951714caa0ae80237f4ffc1f08450e9e2e5f8f902beaf1ad294020875d6f8c2c SHA512 bf4eb1c07832628863f3d315510628343bc4504050311a277a86100a825df8ed5f6b65f58db28ea6733f3886b6007eae7fd33586721374f9ffb3687e9b95d5c4 WHIRLPOOL 898d9427d55e316f2cdfe06d8dadd0f40d8d2374802b419c9b7aac279eed36919f8dc0084c9c253b3b3d75e9dd50ec2748ef2227e803bf900d7d8b0d5395c45e
 DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
diff --git a/dev-python/execnet/execnet-1.2.0-r2.ebuild b/dev-python/execnet/execnet-1.2.0-r2.ebuild
deleted file mode 100644
index ac4cc1275ea5..000000000000
--- a/dev-python/execnet/execnet-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
-
-python_prepare_all() {
-	# Remove doctest that access an i'net site
-	rm doc/example/test_info.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bitbucket.org/hpk42/execnet/issue/10
-	unset PYTHONDONTWRITEBYTECODE
-	py.test testing || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/execnet/files/1.2.0-tests.patch b/dev-python/execnet/files/1.2.0-tests.patch
deleted file mode 100644
index 13bed5d59605..000000000000
--- a/dev-python/execnet/files/1.2.0-tests.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-# HG changeset patch
-# User holger krekel <holger@merlinux.eu>
-# Date 1412585605 -7200
-# Node ID c9303c302995a4fb844553d4977c55abc72e2020
-# Parent  47ff3652b0aed191f7bafc741c211d1415f65224
-fix issue35: adapt some doctests, fix some channel tests for py3.
-Also modernize tox.ini a bit.
---rebased
-diff -ur execnet-1.2.0.orig/doc/example/test_group.txt execnet-1.2.0/doc/example/test_group.txt
---- doc/example/test_group.txt	2014-01-29 19:50:22.000000000 +0800
-+++ doc/example/test_group.txt	2014-10-10 19:51:00.108828123 +0800
-@@ -14,7 +14,7 @@
-     >>> group
-     <Group ['gw0', 'gw1']>
-     >>> list(group)
--    [<PopenGateway id='gw0' receive-live, 0 active channels>, <PopenGateway id='gw1' receive-live, 0 active channels>]
-+    [<Gateway id='gw0' receive-live, thread model, 0 active channels>, <Gateway id='gw1' receive-live, thread model, 0 active channels>]
-     >>> 'gw0' in group and 'gw1' in group
-     True
-     >>> group['gw0'] == group[0]
-@@ -37,7 +37,7 @@
-     >>> gw = group.makegateway("popen//id=sub1")
-     >>> assert gw.id == "sub1"
-     >>> group['sub1']
--    <PopenGateway id='sub1' receive-live, 0 active channels>
-+    <Gateway id='sub1' receive-live, thread model, 0 active channels>
- 
- Getting (auto) IDs before instantiation
- ------------------------------------------------------
-diff -ur execnet-1.2.0.orig/doc/example/test_proxy.txt execnet-1.2.0/doc/example/test_proxy.txt
---- doc/example/test_proxy.txt	2014-01-29 19:50:22.000000000 +0800
-+++ doc/example/test_proxy.txt	2014-10-10 19:16:50.380156509 +0800
-@@ -18,10 +18,10 @@
-     >>> group.defaultspec = 'popen//via=master'
-     >>> master = group.makegateway('popen//id=master')
-     >>> master
--    <Gateway id='master' receive-live, 0 active channels>
-+    <Gateway id='master' receive-live, thread model, 0 active channels>
-     >>> slave = group.makegateway()
-     >>> slave
--    <Gateway id='gw0' receive-live, 0 active channels>
-+    <Gateway id='gw0' receive-live, thread model, 0 active channels>
-     >>> group
-     <Group ['master', 'gw0']>
- 
-diff -ur execnet-1.2.0.orig/testing/test_channel.py execnet-1.2.0/testing/test_channel.py
---- testing/test_channel.py	2014-01-29 19:50:22.000000000 +0800
-+++ testing/test_channel.py	2014-10-10 19:21:00.943955387 +0800
-@@ -68,25 +68,19 @@
- 
-     def test_channel_error_reporting(self, gw):
-         channel = gw.remote_exec('def foo():\n  return foobar()\nfoo()\n')
--        try:
--            channel.receive()
--        except channel.RemoteError:
--            e = sys.exc_info()[1]
--            assert str(e).startswith('Traceback (most recent call last):')
--            assert str(e).find('NameError: global name \'foobar\' '
--                               'is not defined') > -1
--        else:
--            pytest.fail('No exception raised')
-+        excinfo = pytest.raises(channel.RemoteError, channel.receive)
-+        msg = str(excinfo.value)
-+        assert msg.startswith('Traceback (most recent call last):')
-+        assert "NameError" in msg
-+        assert "foobar" in msg
- 
-     def test_channel_syntax_error(self, gw):
-         # missing colon
-         channel = gw.remote_exec('def foo()\n return 1\nfoo()\n')
--        try:
--            channel.receive()
--        except channel.RemoteError:
--            e = sys.exc_info()[1]
--            assert str(e).startswith('Traceback (most recent call last):')
--            assert str(e).find('SyntaxError') > -1
-+        excinfo = pytest.raises(channel.RemoteError, channel.receive)
-+        msg = str(excinfo.value)
-+        assert msg.startswith('Traceback (most recent call last):')
-+        assert "SyntaxError" in msg
- 
-     def test_channel_iter(self, gw):
-         channel = gw.remote_exec("""
-diff -ur execnet-1.2.0.orig/tox.ini execnet-1.2.0/tox.ini
---- tox.ini	2014-01-29 19:50:22.000000000 +0800
-+++ tox.ini	2014-10-10 20:14:22.806301771 +0800
-@@ -1,16 +1,11 @@
- [tox]
--envlist=py26,py27,py32,py33,pypy,flakes
--distshare={homedir}/.tox/distshare
--
--[tox:hudson]
--distshare={toxworkdir}/distshare
--sdistsrc={distshare}/execnet-*
-+envlist=py26,py27,py33,py34,pypy,flakes
- 
- [testenv]
- changedir=testing
- deps=pytest
-      pytest-timeout
--commands=py.test -rsfxX --junitxml={envlogdir}/junit-{envname}.xml []
-+commands=py.test -rsfxX {posargs}
- 
- [testenv:flakes]
- changedir=
-@@ -26,8 +21,7 @@
- deps=sphinx
-      pytest
- commands=
--    py.test \
--        -rsfxX -v --junitxml={envlogdir}/junit-{envname}.xml check_sphinx.py
-+    py.test  -rsfxX -v check_sphinx.py
- 
- [pytest]
- timeout = 20
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index b97ac743282a..e366d2702729 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,8 +1,3 @@
 DIST Fabric-1.10.0.tar.gz 208969 SHA256 edb2702b4655600f0a49a97e654c79f5b21490ce30f77d1313dd851f0b60335a SHA512 991341dfb3f71e938c2a2e30f5bc158be84cb1600ab64c4f7c5c49decd0a38bc57615f9e07edfbed70d9ca796592d7c1a4f7f3e25a40c4d31049015df928b2e3 WHIRLPOOL c07ba33bd6e7832fd5527ec14e206d74a6a2b983dbb49a43d972f31e15e22f9642df4809adff72f43f92fca5c1d758a4ac540ed87e22f46adc25094b2aa4ccb3
-DIST Fabric-1.10.1.tar.gz 209750 SHA256 ab9c54e9496c89ae96ed4aa669e01c792376d75a7389ec90d4292282cc26f008 SHA512 a00f46ac28c61d20575af9f34e4e2bc54a79e836c29b395bbdf58538b6c75523a7ec6f3f40caf0f270d2ec8b0500806b14e80c4ed4d2077e39f4dbdd773d8637 WHIRLPOOL 88b5865ec80ff923292b0ba4a868a06fa5cc0f68b3a8ab2fbfb68f17422b9b60a365ea3b14b5f04929425bbcf9350acbc72dc1733200c18a80d954c3c1762ce9
-DIST Fabric-1.10.2.tar.gz 212942 SHA256 666a3da92273532d3a49dd1ac53e3d721c5ec2f2512cd7dddb7ce19e29e9f038 SHA512 3102616a8fbc6237df74eb9b506e95628487d2bb112a56826d388a943b6e8af926f4f174a8d8810b27b63e58d2018667d927795c6a5e53833a1d3fc87324b0af WHIRLPOOL f08af6300432655786692a99385f4cd4d8605ac3bd952dd198706bd975c737431df7aaa6dc2d737719ca029305cb3e3359876ac32702f3ad539b65a5ad5501fb
-DIST Fabric-1.11.1.tar.gz 215069 SHA256 336cfa335840136fab8694a539dd61924697b8d0c2f3a12afadf0a6165c0875d SHA512 ab5f10f233d4a37ae74fd166d5b634f1eb4166525a2530b28d3d3a8a28ac792ee7eaa5a7c31379abd065c0e975c17e995707ffcc8e75d6f7e6bf90cd72ee50ad WHIRLPOOL fa3cac7cda273ffb73b28b4c9461a379641a8de53cbf2872fc5fe05b15e2f1177006ae5970b8c016d6959773e24d0d86305a622ca6a6a7203ef47cdc4793cd26
 DIST Fabric-1.12.0.tar.gz 232840 SHA256 fafa17d69a15fd6ae5f82d28acbf90e1bf15e3d7438fbf0e8691868164c0e9dc SHA512 cc07e811873c296c7e33ddadb00af3b4cbd1a87b2617b82505758e6b646e20e55edafe76cd969f3b2a7931a2deb4daefe8e44a7d6fe6ec67e5d9923d6c64e95e WHIRLPOOL 454cf9b2f7eb2c74ca2e6eed349600d37d4306c49da098e46442001e2f720f2df46f4c2eed973916ece7cbffe1c54100dd3571a8696463e10aa3b0ddde0455e2
-DIST fabric-1.10.2-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
-DIST fabric-1.11.1-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
 DIST fabric-1.12.0-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
diff --git a/dev-python/fabric/fabric-1.10.1.ebuild b/dev-python/fabric/fabric-1.10.1.ebuild
deleted file mode 100644
index 025b8358f5ba..000000000000
--- a/dev-python/fabric/fabric-1.10.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Re-set intersphinx_mapping for doc build
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed  -e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
-			-e "s|    'www'|    #'www'|" \
-			-i sites/docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
-	fi
-}
-
-python_test() {
-	nosetests tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( sites/docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fabric/fabric-1.10.2-r1.ebuild b/dev-python/fabric/fabric-1.10.2-r1.ebuild
deleted file mode 100644
index e84ff20068fb..000000000000
--- a/dev-python/fabric/fabric-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
-SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Re-set intersphinx_mapping for doc build
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed \
-			-e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
-			-e "s|    'www'|    #'www'|" \
-			-i sites/docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
-	fi
-}
-
-python_test() {
-	# 1 failure, reported https://github.com/fabric/fabric/issues/1360
-	sed \
-		-e 's:test_abort_message_only_printed_once:_&:g' \
-		-i tests/test_utils.py || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( sites/docs/html/. )
-	distutils-r1_python_install_all
-	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
-}
diff --git a/dev-python/fabric/fabric-1.11.1.ebuild b/dev-python/fabric/fabric-1.11.1.ebuild
deleted file mode 100644
index e84ff20068fb..000000000000
--- a/dev-python/fabric/fabric-1.11.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
-SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Re-set intersphinx_mapping for doc build
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed \
-			-e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
-			-e "s|    'www'|    #'www'|" \
-			-i sites/docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
-	fi
-}
-
-python_test() {
-	# 1 failure, reported https://github.com/fabric/fabric/issues/1360
-	sed \
-		-e 's:test_abort_message_only_printed_once:_&:g' \
-		-i tests/test_utils.py || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( sites/docs/html/. )
-	distutils-r1_python_install_all
-	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
-}
diff --git a/dev-python/fasteners/fasteners-0.14.1.ebuild b/dev-python/fasteners/fasteners-0.14.1.ebuild
index 29236f77508f..f22c0f4d640d 100644
--- a/dev-python/fasteners/fasteners-0.14.1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 6eb9cde47a63..c0ecd86c5cd0 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,10 +1,5 @@
 DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2
 DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4
 DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23cab132e8722c68be80d6f182 SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee WHIRLPOOL 6c1e737a760876d410fd116bf2b8104f932b6751b5970096ddadcead5937fba21772fb28c1addf8026eda5ec573eb07cd920e46fb711d79f46de559d229c8705
-DIST flake8-2.4.1.tar.gz 50324 SHA256 2e7ebbe59d8c85e626e36d99f0db2f578394313d3f7ce9dc9f1da57ef6cd7537 SHA512 8ddd07d6be53b06efcf7dd9aa2daa070ab209f7177e46f32a3bcae545acbb5e020aa27aeab54426798ae6c3722b38928b06dc3e53115cc624a16fa0fa97f4840 WHIRLPOOL 9a653900523eded448c5cbeca0b111ba220be39ad307e46ded35a1454904cb59f5e0765425d90e99ae0c853b2931fbe910c4412e73771098bb0a3543adb8cabb
-DIST flake8-2.5.0.tar.gz 82600 SHA256 8216c8c6ee092ae93d51f89bc91045648c88cd9be77d60cf47df7ca26ee4f88c SHA512 6f55ae237fb834fa9376760eddf77553f9edb1b7328175c5f07232b160e4d5ea9d65caa91241f7d1db90845f9c02b8d41129cd453c1b09a4d6870e0e53ba0f8d WHIRLPOOL d08e5c2d2c488e558e02a272c1753defa2a200d37b2b113f1f1523dc06f6ee5dc7f37c60f598eff91c4aeb47a76bd0dd60c0fdd7d2a6b7fa0a7bbec2b60a88d2
-DIST flake8-2.5.1.tar.gz 83692 SHA256 448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603 SHA512 030d2464717f62e3c5501631e7bc4482321086ca3e7f7dfe845dab66aaf38be94565c1e147792ba7e7d2850fd5290e61a24fe1006daf18c3be2ff81348c5731c WHIRLPOOL 63a6915eeb32be4aa51f3b69c5c6918c3a2953a4dff203515d20a10e58dc12cf7732a5e715b279c17d2a0e4b77f6879dc9f489395ddbcb6d0c340a21be39f9e4
 DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
-DIST flake8-3.0.4.tar.gz 1382588 SHA256 b4c210c998f07d6ff24325dd91fbc011f2c37bcd6bf576b188de01d8656e970d SHA512 845b38824112edfc8244f6ec795b5659f99b4e8171af5e6c737f345e5a429f7b26f57e24ccc42fa2d8117b7ceff4dd100fe840064260fa17f203804e4b83ab06 WHIRLPOOL 79300674a1a326d95e80208cee664b0ddcd518653cac2aac381a3a32c1bcc40b4ddb00f95b064e119bc7f40098240e77b16898db688b87a2571ad523eac72a44
-DIST flake8-3.2.1.tar.gz 129458 SHA256 c7c460b5aff3a2063c798a77af18ec70af3941d35a22e2e76965e3c0e0b36055 SHA512 9ccb4e13d87ae1198466f112138d5ef423f55e9af1d6ab9f14d6927bd40b9d621d1a74e0acd43b1ba4e12cae67d7671dde205c04f5760d760ca9d982655d4ebf WHIRLPOOL a4210bbc535fc6d61853c39ad44e2274963e8854eadaf4236c7edbe5dc367ea31d60f742e5f634b4b1ff0aea55a43aaebd29201cb5dcfc818e94aac4d6d34bf4
 DIST flake8-3.3.0.tar.gz 134345 SHA256 b907a26dcf5580753d8f80f1be0ec1d5c45b719f7bac441120793d1a70b03f12 SHA512 53b3116765f9031c96a0442954f324fe3edaf63aff21f7cf340e47e724250928d6d9786473d2680b695969ef979a8bb6d4d2b39f1598b075dcace1b221a4c099 WHIRLPOOL 1a0f7e228cbfdde18957c43377fd5c07a280628ca75138e76ec295e5567c153e454543e534496ec9217e7ca0389208ae143c3396ca3798b65b0f2ce1d72bd68b
diff --git a/dev-python/flake8/flake8-2.4.1-r1.ebuild b/dev-python/flake8/flake8-2.4.1-r1.ebuild
deleted file mode 100644
index 5c59c7489488..000000000000
--- a/dev-python/flake8/flake8-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-	"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -e 's:, != 1.6.2::' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.5.0.ebuild b/dev-python/flake8/flake8-2.5.0.ebuild
deleted file mode 100644
index aaa093d6e227..000000000000
--- a/dev-python/flake8/flake8-2.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-	"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -e 's:, != 1.6.2::' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.5.1.ebuild b/dev-python/flake8/flake8-2.5.1.ebuild
deleted file mode 100644
index e0851514d31f..000000000000
--- a/dev-python/flake8/flake8-2.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	        <dev-python/mccabe-0.4[${PYTHON_USEDEP}]
-	)"
-PDEPEND="
-	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -e 's:, != 1.6.2::' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-3.0.4-r2.ebuild b/dev-python/flake8/flake8-3.0.4-r2.ebuild
deleted file mode 100644
index ed3f415fe770..000000000000
--- a/dev-python/flake8/flake8-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-IUSE="test"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.3[${PYTHON_USEDEP}]
-	!~dev-python/pyflakes-1.2.0
-	!~dev-python/pyflakes-1.2.1
-	!~dev-python/pyflakes-1.2.2
-	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy )
-	"
-PDEPEND="
-	>=dev-python/mccabe-0.5.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)"
-
-python_prepare_all() {
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -i -e 's:, != 1.6.2::' setup.py || die
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The test suite assumes the presence of a tox.ini file in ${S},
-	# yet the distributed tarballs do not include that file.
-	touch "${S}/tox.ini" || die "Could not create tox.ini"
-
-	# using "test" instead of "ptr" results in name collisions
-	esetup.py ptr
-}
diff --git a/dev-python/flake8/flake8-3.2.1.ebuild b/dev-python/flake8/flake8-3.2.1.ebuild
deleted file mode 100644
index 00f63ff99d43..000000000000
--- a/dev-python/flake8/flake8-3.2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-IUSE="test"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
-	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.4.0[${PYTHON_USEDEP}]
-	!~dev-python/pyflakes-1.2.0
-	!~dev-python/pyflakes-1.2.1
-	!~dev-python/pyflakes-1.2.2
-	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.3.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-	"
-PDEPEND="
-	>=dev-python/mccabe-0.5.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -i -e 's:, != 1.6.2::' setup.py || die
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The test suite assumes the presence of a tox.ini file in ${S},
-	# yet the distributed tarballs do not include that file.
-	touch "${S}/tox.ini" || die "Could not create tox.ini"
-
-	# using "test" instead of "ptr" results in name collisions
-	esetup.py ptr
-}
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 431273c0fc1b..a206d02374e2 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,2 +1,3 @@
 DIST Flask-0.10.1.tar.gz 544247 SHA256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 SHA512 0008d62d03a46b071c7d0510513d011a9bfd2b77df7f677371a446ca9805d16b1ee5e17dd8dd7cde6443a629370234e44735e20381de20a7da385969797f053f WHIRLPOOL f30a306ed00fe6d4c8e47b781c556c576b99b3545f833ae06f6b778d91c3127dc0adcc34d48221a0f1db1bb1633f2329d6085b7a4550afc672530525fdff474f
+DIST Flask-0.12.1.tar.gz 548511 SHA256 9dce4b6bfbb5b062181d3f7da8f727ff70c1156cbb4024351eafd426deb5fb88 SHA512 23a376ed452bbf874eeeff959924bf8aee51fc9196af71092a7a457742a635fb3adaa958e61625522e93a14092e3bb88a22a74ef419513ca1ae93a1d08723ac5 WHIRLPOOL 29e1c55d094673cb1150780cac5deb1c2964a71e7030b4b4d32dd633fd7631d48687171cf1e745302e0c4dd40d4807a2467ca8c9c4fc9ada4e5d22a35cf3875d
 DIST Flask-0.12.tar.gz 531923 SHA256 93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b SHA512 b8e9e005a850fcba413ad151998768ea0facb68f05855a1934cc6e4de1438cb59a4dd1bc74d2b04d52b3e837afa0a7785e98ae6c5af363a894c2be64773113f0 WHIRLPOOL df0df8db12b18b50d9ddf43ae925717bf4a67179af1d387020e73d4fb5f0c04c6cc1d6c83504d8dc5cbcb4dc11dcb0b63724499bd3c5b820feb181418d965138
diff --git a/dev-python/flask/flask-0.12.1.ebuild b/dev-python/flask/flask-0.12.1.ebuild
new file mode 100644
index 000000000000..851f950e42f4
--- /dev/null
+++ b/dev-python/flask/flask-0.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/pallets/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/click-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	# DeprecationWarning: Flags not at the start of the expression
+	sed -e "s/r'\(.*\)\((?.*)\)'/r'\2\1'/" -i tests/test_basic.py || die
+	# issubclass(ModuleNotFoundError, ImportError)
+	sed -e 's/\(excinfo.type\) is \(ImportError\)/issubclass(\1, \2)/' \
+		-i tests/test_ext.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 8ad6cae44a9a..591c9b819ad3 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -1,3 +1,2 @@
 DIST fudge-0.9.6.tar.gz 81653 SHA256 34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0 SHA512 69b2fa5bdd678779c0a8d9863a67e1e6724828720d2764f9f8958bc3598dcf39b22f9827efccb03014961d27d6e214c2125f639bab200b63c824c2306e3bb617 WHIRLPOOL 176df990c9adebe2d4f969603e48b2f1a797cf9935de3daeab98c078314a3fd88a19affdff5b784db5d570a3264f8cc849305b2e4761a7128c2cca7eed79062f
-DIST fudge-1.0.3.tar.gz 87558 SHA256 f8c8bfb3c0199dd06108c0c5a80e3645c7a071e0917b1a3bc73c761800809251 SHA512 7bbbcf517b2570fae20b882467aa7b739fcc9db2cd4fd2c363536da1a2bdd7c016417f42dcdb27c8422213c847eed7d8a90fd9d43eade2a238e5fc62630d5a6a WHIRLPOOL 9e02ea4d849e364ac979bf41c6fc626cdebf4b60186d9b63afe5dafa85ee4c73a9cdfbbc9762dd994e6b909f86f27caf4abe9f44394e203cbe900149f90f7960
 DIST fudge-1.1.0.tar.gz 86418 SHA256 eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb SHA512 061d9303d28509d4e22eb2036d041359f872be85911dd85bb16e4d13bfc1cf27637f8206f215f4a37d63108ab2500d2af3f6a1a3e206fe461ead9163e0519417 WHIRLPOOL 3425a95652a778b784af99aed54ab90caf3b94fa171c9991e35b5a561ce44e14c2d337c88a3bcd2ea52499dce7d642b70b0be27a45c13fb3d0025abfbbd6d8df
diff --git a/dev-python/fudge/fudge-1.0.3-r2.ebuild b/dev-python/fudge/fudge-1.0.3-r2.ebuild
deleted file mode 100644
index af581f03e5e3..000000000000
--- a/dev-python/fudge/fudge-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	find -name "._*" -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index c4517f7e6207..bc72fecc58bc 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,4 +1 @@
-DIST gmpy2-2.0.4.zip 280459 SHA256 c2b06e75d876960adabce575f01361f96884a64401740af49e8b9ef356bbbecf SHA512 98f57a0b140bb352dc1403dc799845685d52d346e87e6402d1e10c8ef46bbe90bae598143bd2ebffedb617c0519f75590a6cc9b30d887dc08ff6d5ae4fd7ec75 WHIRLPOOL 2f9c903c91c864ef4eb7e02b4004204580af1b7ddf67c67719ab68506a95cf57af64e06bed24ef445eb7eb2de0e7ef550748ac6e8b41e10297fcc22b04cfbca9
-DIST gmpy2-2.0.6.zip 280353 SHA256 5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4 SHA512 fae7952e86c821d8a4ae083a54d6e7e3516459abbf9bcb16408ea0d7989f309aa27348bb51781e0f52466eaf121cb193b54f5f4453093f022ce8394d273196a0 WHIRLPOOL d9a301d5d5f0872ddb517bba815cefaf8c2a3a1fa7e3e0b38f0ea0d2ec1ef8e0526549f8a3d4713b35a878125f1a766bbd3c31e0eb27902266bf3ae8a8dc2559
-DIST gmpy2-2.0.7.zip 280400 SHA256 7ee694b8a4c3854f27890676aa8a509a2e3f8dbdd0916fa94cbed612420b9c86 SHA512 47ba58da98cc36d4eb1eaafbf3b8c0ef31fa898d85bead6bf2fccd24ce5e33a23b66c199349b85e5ae0289ca7e651ccb0a5dd2657b4419331aeeee14a17c9291 WHIRLPOOL 099fac123707851be1743ac3e23dcbfe613bc18f608369e46541b7fdc9f52b5cc61a4ab5d1233f9e88db3a058fb402f5996c33c3c2e81d47dd4adf1e12cb559a
 DIST gmpy2-2.0.8.zip 280551 SHA256 dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4 WHIRLPOOL e78b7fda27a3df8f72750b7ae6a6ff734013a68e8a39b52a3e0cc64076084ae8c5e7024684714a9a83fe22a28d7a1be4bfff7b289bfd4b797900e20790c279b0
diff --git a/dev-python/gmpy/gmpy-2.0.4.ebuild b/dev-python/gmpy/gmpy-2.0.4.ebuild
deleted file mode 100644
index 67be62398e31..000000000000
--- a/dev-python/gmpy/gmpy-2.0.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2
-	>=dev-libs/mpfr-3.1.2
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-		)
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	export CFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	${PYTHON} runtests.py || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gmpy/gmpy-2.0.6.ebuild b/dev-python/gmpy/gmpy-2.0.6.ebuild
deleted file mode 100644
index 4adf193ace26..000000000000
--- a/dev-python/gmpy/gmpy-2.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2
-	>=dev-libs/mpfr-3.1.2
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# rm non std test file
-	rm test*/gmpy_test_thr.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-		)
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-	if python_is_python3; then
-		cd ../test3 || die
-	else
-		cd ../test2 || die
-	fi
-	"${PYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gmpy/gmpy-2.0.7.ebuild b/dev-python/gmpy/gmpy-2.0.7.ebuild
deleted file mode 100644
index f54fe0ab9cf4..000000000000
--- a/dev-python/gmpy/gmpy-2.0.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2
-	>=dev-libs/mpfr-3.1.2
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# rm non std test file
-	rm test*/gmpy_test_thr.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-		)
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-	if python_is_python3; then
-		cd ../test3 || die
-	else
-		cd ../test2 || die
-	fi
-	"${PYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 82b9ee575837..8b74194ccf88 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,3 +2,4 @@ DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b
 DIST google-api-python-client-1.4.2.tar.gz 2289731 SHA256 dfb7feab9733ae99952545927b5d87dda24cea308b2040fba2c505e7f0c57696 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5 WHIRLPOOL 006e24d1a4e5d2bfabcbf2503fa163d6b0a3a28a839396014bf0a91a463454f02140f38dd179a141010a03e268711c2d22c9aa3158b594e5b465d9032997e7b9
 DIST google-api-python-client-1.5.0.tar.gz 2683924 SHA256 1558d6a6bca8c4ea775be46c6a81364739dc35b7ad2afc660c3a3102a43165bb SHA512 082a89e2e52dff449b6c4b6800503e337c5f2aa7ea2ca45a8373743a312d18d24ad87a486aed77b2e26075ba897f36e1129852dc30a139750e75cce5a1c25aa4 WHIRLPOOL f306a91fda8f241774a0b121dd8741ed5342aafb920b1bb59ca46a296ac7eaee4072839480abcd592a52d92e01811b9032545f93e8528211edf51d0cbe07644b
 DIST google-api-python-client-1.5.3.tar.gz 3622355 SHA256 1a89429cb591112463fe6fb7fcc23c9475e52bcaa337a3d9bb375891fbfe7525 SHA512 3f58af0d1f165fa7e045d08a0bfc282855b40dbea16d310bbc4cbce76f631b6303738a396048efc8ea114fdff1164d1ad303148999d0ab0ba0d2cc91df9408b3 WHIRLPOOL f878baac9a29065ce8cab67b41716697cc7f34205384e41b8849ef38271d75442c7d44922e56489cba7dc4871c216f37050e61ecc6d0302056adea72a57f9387
+DIST google-api-python-client-1.6.2.tar.gz 4262337 SHA256 1b2c0429fe7e85d243c60ed8ae11d3652664cd0066b118ade04405d598092850 SHA512 ee906c2efb47469dc18dcfcb1edfad4346f61e88c1e7f73b60924b393c704e7033a5ff4f9a1965d0c29aa3a6bf25b60888e1d39366cbc1372861b49e79c9e886 WHIRLPOOL 025404e922a15f4986fcbaacddd6fb7570b47679689058b1663611731ba74a2cca2a2ac993737558868c575950db04216d860a68c512fbd8c77e98d3871e6474
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
new file mode 100644
index 000000000000..d9dc381aa237
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
new file mode 100644
index 000000000000..80b9a3623847
--- /dev/null
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -0,0 +1 @@
+DIST google-auth-httplib2-0.0.2.tar.gz 10830 SHA256 56ad472d166aeddab10fbf6b6a39848c959379e12b9cbcb5ccf2530eda61b4de SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0 WHIRLPOOL 8bf72785a168905a6d1a5d6f2ec093d54e93799f09c0e0f5e53bb0de96c200a8638ac68bc393cd0b4dce4cca4b6299a202086d943dec917ee8733aa792869a99
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
new file mode 100644
index 000000000000..049c2bdf9806
--- /dev/null
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+EGIT_COMMIT="607e86011141e8885b1f52826d57c8b5ff588ffc"
+MY_PN=google-auth-library-python-httplib2
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="https://pypi.python.org/pypi/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
+# PyPi tarball is missing unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_PN}-${EGIT_COMMIT}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-auth-httplib2/metadata.xml b/dev-python/google-auth-httplib2/metadata.xml
new file mode 100644
index 000000000000..aaafa4650042
--- /dev/null
+++ b/dev-python/google-auth-httplib2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">google-auth-httplib2</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python-httplib2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
new file mode 100644
index 000000000000..04adfd4a1506
--- /dev/null
+++ b/dev-python/google-auth/Manifest
@@ -0,0 +1 @@
+DIST google-auth-1.0.0.tar.gz 66514 SHA256 9cec5a1e8161e5074a54af66f0f2ebf2cbdcc4aad1ffaa804589c3029695fa6a SHA512 7826bab85a68109f8118a28a1b9e5e4a5c0953ee1dae8f8ba266fefed4c949d0a20680fd0b3019f137c2d9b2d350825cf6679db110238808e7e5bca49704d6bf WHIRLPOOL 4b422bc70ad34a40135c1400aa7b7c45029ab420c16ba499f12a421585b4e0d45562458183f8e4f7a0027f312ce8d8cf5da3f4d0ffb65fe6381a1f0a75fc806e
diff --git a/dev-python/google-auth/google-auth-1.0.0.ebuild b/dev-python/google-auth/google-auth-1.0.0.ebuild
new file mode 100644
index 000000000000..33a15b28e756
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://pypi.python.org/pypi/google-auth/ "
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# urllib3-1.16 raised MaxRetryError, not TransportError
+	sed -e 's:test_connection_error:_\0:' -i tests/transport/compliance.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
new file mode 100644
index 000000000000..9ee4c6540b0e
--- /dev/null
+++ b/dev-python/google-auth/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">google-auth</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index e950cccf2342..5b943f7c6c8c 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,2 +1 @@
-DIST hgdistver-0.22.tar.gz 5442 SHA256 97bfe6b57f0edf67dc4d59abf3abe949584499cd3f67350052d9e2601e749bdf SHA512 690c4fd1fdafd853539c37703982ece5aca6df8a7c03b35e98447ec6349454f806500ea8fcf9efcca8958286e3e5f36fc86d2ae81f64ab61397cc86106cec7ad WHIRLPOOL 53050ff028c8c67840967d20209bb9c50b1e33b74786b0f7ef984172d6f87c05b111d51e8d3cc06ebdd6aa52aa34dc59d90931e5ebb0a16f50c1b071bb0d15a8
 DIST hgdistver-0.25.tar.gz 9879 SHA256 603bed5bcd892252b4501375fbca4a24de7937418e0a6ef299e3902c5a198d8d SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c WHIRLPOOL 3afad9490e51b67bb90671377083eb0e853f242f088f83f4574d3ff19506cafed04c4c089f54e603ede5f3a5d6e1b9eafd0db00095d2f1c0b9ff0451efdb407e
diff --git a/dev-python/hgdistver/hgdistver-0.22.ebuild b/dev-python/hgdistver/hgdistver-0.22.ebuild
deleted file mode 100644
index ad56837ee655..000000000000
--- a/dev-python/hgdistver/hgdistver-0.22.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
-HOMEPAGE="https://bitbucket.org/RonnyPfannschmidt/hgdistver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 228f58c9eb70..012bd9abfa81 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,4 +1 @@
-DIST humanfriendly-1.44.1.tar.gz 44281 SHA256 a9c545dc284c8e310465dba0b2300d898a9dc0d6eba5852f7578e03ff3ffc4ea SHA512 d5467e75c2e84c50dacaaab1c14b71a536eda5b91f4fc2d6ca69f1f1e50fe0ac215ac6cbf91cf7df08456f3058dcf84f0e38f611022c295e90c936e3b8a77cc9 WHIRLPOOL 869f86cd719fb9f3810767a37f43742ff21e9664229ccc4525873c84288fff8e9f08530796f54f2f1bea3b2df0601a424c5a253a42940c2d6a99cdbe19b20627
-DIST humanfriendly-1.44.3.tar.gz 44682 SHA256 910a01f17d73536d53f0464c3d825e64efcb56fff80c58b383b78bfab5f934d0 SHA512 7ddba207e9946ea38ec7d4aaebe87c38ae7cec0f87d7576a8e99425f9678e7b90d830de2518ba898ba485d86e4b363022a9919dbf4fdf0b6cdd4bcf1629cd1b5 WHIRLPOOL 58683b1085e92d0d9c24a9b31c189f20a6d04f9a0eed8369ef180d0e0e66bcf878c251d61dcce905ad53223b480e1d244ff239d56b5a13d730c48952ec85007a
-DIST humanfriendly-1.44.7.tar.gz 45058 SHA256 fcee758612edc6fead9b8fd1d5a473eab2c3a84cf8766f3ce70862ccd35e8a64 SHA512 07ac1b6376dd144bb0fefaa5aa801cf05165d913ba9138bbaa0ab708fd262e76871a4821c7675ba10a2c212a3645c615a5abe01339c073730357dd85c0b94ffe WHIRLPOOL ab70278bed60136fa7aec3cbeb118458152e5a295c1cbc0cdecabc932e97eca4097ec37eae3dcbd12496a487818cb531c82a55fe9e75394d13cd8fc488b9871a
 DIST humanfriendly-2.4.tar.gz 51037 SHA256 bccba2151adfe4b058667cc995c780e21b36502af24ef4037fc37609f2ed6c2d SHA512 e35017c6be9d80ac5e3465836aae4f5b1ea4358224e250c7c1b7e3a93c2764832382e0ec24ea54e1d656fd8874c12b23ffc535440870b55a532800c5953cc676 WHIRLPOOL cf6678904edb6344f249ac8e8c5c3cef5fda72f7903d6a50cc4c17dc766060784591e6bc350451a5b46045414997ed44fac9627887bec14c4cf9de414191f658
diff --git a/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
deleted file mode 100644
index f6a5c47d703a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
deleted file mode 100644
index f6a5c47d703a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.44.7.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.7.ebuild
deleted file mode 100644
index f6a5c47d703a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.44.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 59bc6b0aea1a..428c149ee27d 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,2 @@
-DIST hyper-h2-2.4.0.tar.gz 77440 SHA256 c673efad0b8ee3c3c604375dd5e0c3dbc74f3c4e0385dae120d22b7d6f6ec301 SHA512 76835d6c97d4aed515b460bdbbcb8aea1ea061a416386cadf66a0e9b3c213a9ffe67948ce49b922d99e1895615a03159aa6aed198857e1ce73eb734b8bd9a016 WHIRLPOOL 9a5c1d313f53ee842403c77a8324aa432ff3d04d3d3737f6f7da83e5ff85e51ea6794419fa8886368cf34d4a7be3ff3b7ed19eb13a74ef8318fad738a71b9ef4
-DIST hyper-h2-2.4.1.tar.gz 78056 SHA256 a914161895f60a16d7049386c77f2eee72af7fd49b117856033906e16110c9f4 SHA512 f7a29350a3f31740acf6fc199fb5f3fa06d751abcfbf5a2742370c40c656417ccc659d49b9754e5faeb09ad121c362a478076af81325644d04473d56fc83b07a WHIRLPOOL 4917deb305cca78a6cc8fcfeb34e8f4ef8982c213edc7c3f242422e992d1105ccb151168ad7387fd53faca6061a693cf76f7cb3f91880470cd7bf03bb7a73b26
-DIST hyper-h2-2.5.0.tar.gz 92558 SHA256 6c1512798f2ec2f178b5eed80be3c5239145d23989a1ff3c7cc635ee679cc241 SHA512 f7141da1ce6bd7b27486a0f091c62fea6ccb6fad84bd97b024b611e4d76b7a056cee6a63c179268b324673671dd833981e00dc32c441f340f5c472828f6e62a2 WHIRLPOOL 5e7c5e8d5ab1491427abda81c8c133017cf0b35aaa2601b393c0a24844a7e7988efea1401a72ef08dca04d8e389c89a70272f13f48c90675a05aa9766afbcbb5
 DIST hyper-h2-2.5.1.tar.gz 92713 SHA256 673937480f97ad5a1fc8d78ff937352083c82525905b0f631db841c776a91f76 SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c WHIRLPOOL cc1d761bc636fcdb1d760c04676c50427d6a0940bf739244e738506982116338e108a4d2d2dc016127894d1dea842709a2f667239cdd9320e4f1fcc73e7c86bb
 DIST hyper-h2-3.0.0.tar.gz 2203892 SHA256 67a48d035ffbc4535ddd5cad154ab9cb8511e4f7d1f1d87272616b9d2feb6e22 SHA512 bd878e4b27cf67b46ea8099d8ca86cb91d240520f91543bce777565016a3010ae6f62302aa8d498037b0f122079a6e45f175fc343ca99dfb3c1929566cf16ca3 WHIRLPOOL ac62582108cca422120d6f86e3353cd91a6c0e0ddde571b5e45f9db7089c03487456f15f88d14fbfdf039f074afe248175933ae96cc41a702f1a2621f254f379
diff --git a/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild b/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild
deleted file mode 100644
index 42ae05dc4ca7..000000000000
--- a/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
-
-inherit distutils-r1
-
-MY_PN="h2"
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyper-h2/hyper-h2-2.4.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.4.1.ebuild
deleted file mode 100644
index 42ae05dc4ca7..000000000000
--- a/dev-python/hyper-h2/hyper-h2-2.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
-
-inherit distutils-r1
-
-MY_PN="h2"
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.0.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.0.ebuild
deleted file mode 100644
index 8cc25ebb2715..000000000000
--- a/dev-python/hyper-h2/hyper-h2-2.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
-
-inherit distutils-r1
-
-MY_PN="h2"
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-# missing files in tarball to run tests properly
-# upstream issue: https://github.com/python-hyper/hyper-h2/issues/371
-RESTRICT=test
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index c2a71786dea9..3ab05401a8fd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,2 @@
-DIST hypothesis-1.19.0.tar.gz 86227 SHA256 0e977a3492f5488ed9dd4a872cefae0934ad4ccd0229a6c483ef5ca0aaaddd6d SHA512 3b2cd671498bd0bc88c93b2753f35b02f737533dd8dbc786420a37a417d145e4f1c579741966394f85b7df4939e61f77315e6158b29e22f9bde07d31e161e009 WHIRLPOOL 52b444e6e3fa0c514ebb9816cd489b2441b213581e241f76ab5aa5c410ca08bedef92f0b608c32c421f74ba84a0e26850a2aaf9f2d9f7229aa176d9e501175a0
 DIST hypothesis-3.6.0.tar.gz 73586 SHA256 ecb0e711ab83032c54605d88fda1e07ca5c6025bdb5e91deab96eca29491f678 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389 WHIRLPOOL 189c788fdd0a326879a468061c271b14056da5f7dc1d5975e8f360cd5a91957eb8f79c26a045fbe49d7b11f7cc09024d3d09a353321b1dda1d4d96b452fd9e7b
 DIST hypothesis-3.6.1.tar.gz 75106 SHA256 d4a0aa584ee4654819b8bfc8b5791669ad229eb1db949716543d7c31219cb35b SHA512 89a884cfc147b09e6356ea1f2272784b256065a7ff86584c133c00d11cb0fda0a8463e347c15698c605f6c2d8fc7aa09cd4c216849cb2b851566bdf4268c28c4 WHIRLPOOL 1a65ad7442ba457390414c3117fdcde6981adb6e7cd0269b47ac7ec63e60393af386518f4ca79410222ff7533b12f87a99705f22fd9b20befdcf6a6a4a422e12
diff --git a/dev-python/hypothesis/hypothesis-1.19.0.ebuild b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
deleted file mode 100644
index 51bb132fdf8a..000000000000
--- a/dev-python/hypothesis/hypothesis-1.19.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pytest support" dev-python/pytest
-#	optfeature "fake-factory support" dev-python/fake-factory
-}
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 85ccbf8fb1b7..56453af378ed 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,6 +1,2 @@
-DIST idna-1.1.tar.gz 99242 SHA256 3dab514abd255ada7994a57161750e8f054b938bf7adb8b40b96f13df54efaed SHA512 eb7a3673641827899ab9a4ba56f214e1fd3d17370d05bb04464664c2752ba7636507c3f6a64c9e24d44a1dd566842ffc86ce01351c1bfcebc3248baab786b99c WHIRLPOOL 90c1e03b23f3765749778f41ad7eac5befd5122f0552cf1616c7e4f53ae1d3f68f964753bf050956d773b720d608479830d72eb0a94d62848eab86ab4491326e
 DIST idna-2.0.tar.gz 135150 SHA256 16199aad938b290f5be1057c0e1efc6546229391c23cea61ca940c115f7d3d3b SHA512 005f88e954f13ace584ced510752da58d1cb16ebfbeee10aeef5bec57b3c61a3a5d7ce0bb50deba6dc90b412607727bf94a95a785e91d6528cd8633961c142dc WHIRLPOOL d865420f1c5f648d12480af93a52e0b2d463064c34c57ce56022f6965c2e4f6a49244e7798b9fcc18a7c6517b98e88bf84dc52e0050abe2ce504365b5579d2b6
-DIST idna-2.1.tar.gz 128996 SHA256 ed36f281aebf3cd0797f163bb165d84c31507cedd15928b095b1675e2d04c676 SHA512 b275f48f46694d54915cb48fcc65b683895ff9834bb267c77535aba0c9c6d8ca10dc207cf5ec53c167e66e236d943a3ec577c140aa5cfc8ad286800b7c67b63b WHIRLPOOL aedc489c61a97d5a736fcacf11636277e21d08fa14f3738d2aa68e8b9ffc3f0fae47163fa88b2bc2b1ba87e9a805511a73c5f32158779ea5eb9dcfa95d0d7f29
-DIST idna-2.2.tar.gz 130203 SHA256 0ac27740937d86850010e035c6a10a564158a5accddf1aa24df89b0309252426 SHA512 affd8738e78ee0db7e44e508bab2a2223e9d1991711a4930ce820354e2c348f92502bd27fb6a93a25300ce78bac444b808143f2754b44720c19d4707e60d56ae WHIRLPOOL b88e5ae0104a9c2a3cfe7650f62f814618f8dba636894890a22294cc01cc5b2d349889f822481e2575a57632cfb3e0bd8dba9fd2594146f0390ac4139be36c2c
-DIST idna-2.4.tar.gz 130182 SHA256 2a07165f6288f4b920aa8ab4357c1e59073c5d62e048a400510982769e039bd9 SHA512 3cece561846b1f0fcc76a77eefd68d9bdb704941b7ec80ac0a025d471c0ea7005cccf4a9b13229c7676fde71ff37ae2fb847c836e3097e3f64b85ea57682dd19 WHIRLPOOL b5c071af97059a2646136a72639d910a87a4f71c9e8eaed3f430415eae5611b6c4f9ccd367eb6d0e4c7782322a96bd8444703872abea002625a2358003d5d5bb
 DIST idna-2.5.tar.gz 130211 SHA256 3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835 WHIRLPOOL 8b54100310e57a35eacbdabd14f3e612b5ecbc87335e174ae84aeec4e52d29f4ddd570c5958228b3b7b4bc706cecd16f05862b6669aa9ca5698fe7e7d4eab469
diff --git a/dev-python/idna/idna-1.1.ebuild b/dev-python/idna/idna-1.1.ebuild
deleted file mode 100644
index 51e4bc47a7ab..000000000000
--- a/dev-python/idna/idna-1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.1.ebuild b/dev-python/idna/idna-2.1.ebuild
deleted file mode 100644
index 7f70df0e15de..000000000000
--- a/dev-python/idna/idna-2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.2.ebuild b/dev-python/idna/idna-2.2.ebuild
deleted file mode 100644
index 72dcc05fcd85..000000000000
--- a/dev-python/idna/idna-2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.4.ebuild b/dev-python/idna/idna-2.4.ebuild
deleted file mode 100644
index 4f3d92e16dc7..000000000000
--- a/dev-python/idna/idna-2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 442ef9e55839..6dd80614e554 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,7 +1,2 @@
 DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
-DIST ipython-4.0.3.tar.gz 6207899 SHA256 3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0 SHA512 1e2deb597348757e69aaeadd0632cf984056e5f7278ee5bbbd7b4233581323b07f55685b1891c23dc0977d9f30f7dc734dcf2216bc8876424cdb0f7a9294fecf WHIRLPOOL 1beb60e6daf3cea4609318e87a07307843eeb1002847f8c3c5fbe8e114ab29cb052c810884b410f1e8414437b91c5335048106756e2d88a82a7e440e3ff8fc17
-DIST ipython-4.1.2.tar.gz 4953949 SHA256 052f9692a227f285febecec856d749811ac6a20b32c7629b4de31f04ea701692 SHA512 2a28a82cbc5d11cb1f1c88e452f52dbc6b196ac12d46cdec1f35d49e7f97aa8ee5c2a90a6f02f072297c4ef17f84a4454100a4b2594968ec46995c4fd459c09b WHIRLPOOL 1ae1fb4a88d9fd73c93ce096cdb4754d3153e156d87760b48825a2af3ec7eec3d3232b2b0f59f5fce94fb4e14b8c51361781527d9f5320a336ed786fc339567f
-DIST ipython-4.2.0.tar.gz 4935042 SHA256 dba42f182b5f6f26630d2202efd30383712d9f7d8d8d9896b37ae2145deca616 SHA512 01c931a9745af7d43d174b761b506b78840ac9484007741665ff3d4a448131384194869552957353d07beb35e29187743353002c7c0a31f3b336f3b01a64a323 WHIRLPOOL 62468bef537d7533eaf9c89106bd7587dae70c921d623374c0ea796262e304cbf53020375c1876ebefb8b42e7d896b8b071afbcd5e1c710dac4a0a00783f3d82
-DIST ipython-5.1.0.tar.gz 4945490 SHA256 7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961 SHA512 84dbb5629d7a781abdadb9015dc637551bd57427d3187a55de3fb7f50d3d36afb1a8c0a5aaf75da95a8ff41ab623a3c6216373b2145914b960983ba0bf52c3c2 WHIRLPOOL 298e5c248a9d56ec3d9d9824ecee67da95c48d664a44643b8eede8e1719c7d6566b8dcc1fbf8cd4ae8f2829218ad189e9415fb931151b71402a40f326ca9cf01
-DIST ipython-5.2.2.tar.gz 4948601 SHA256 6ee1c89f6031e0c86727820ad394c6eb4d3ac28de48e0df3b9367ccf92e212e2 SHA512 ca4663adca98ce6e1a7e6d3a4e7050e64e73ab2ffeb49ad35322f002ee88fdb9db68ecd591cbadaf00d47df22890f70042d8671affed1a86dd24e609667c6d5c WHIRLPOOL ab6fb9b362b3697884df0c1d5208253fe8e341f6cce552bd4d74268f8fe76d0355ba7749d9f7defad641eafce2db0d35000850b4bb796aa4a2024564ddcaa472
 DIST ipython-5.3.0.tar.gz 4967956 SHA256 bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d WHIRLPOOL 96478b15fd4928d11da35dbbaba6492ff12cf739c06b6f9cf8fdd827060baf5c07d093c3e340792b62102f85ada0b6ea29adc742b784ad21e5292cde09a6fa25
diff --git a/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch b/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch
deleted file mode 100644
index ba17f0fbcadb..000000000000
--- a/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
-index 9e7be2a..a1f0f73 100644
---- a/IPython/utils/terminal.py
-+++ b/IPython/utils/terminal.py
-@@ -9,22 +9,18 @@
- * Alexander Belchenko (e-mail: bialix AT ukr.net)
- """
- 
--#-----------------------------------------------------------------------------
--#  Copyright (C) 2008-2011  The IPython Development Team
--#
--#  Distributed under the terms of the BSD License.  The full license is in
--#  the file COPYING, distributed as part of this software.
--#-----------------------------------------------------------------------------
--
--#-----------------------------------------------------------------------------
--# Imports
--#-----------------------------------------------------------------------------
-+# Copyright (c) IPython Development Team.
-+# Distributed under the terms of the Modified BSD License.
- 
- import os
- import struct
- import sys
- import warnings
--import backports.shutil_get_terminal_size
-+try:
-+    from shutil import get_terminal_size as _get_terminal_size
-+except ImportError:
-+    # use backport on Python 2
-+    from backports.shutil_get_terminal_size import get_terminal_size as _get_terminal_size
- 
- from . import py3compat
- 
-@@ -122,4 +118,4 @@ def freeze_term_title():
- 
- 
- def get_terminal_size(defaultx=80, defaulty=25):
--    return backports.shutil_get_terminal_size.get_terminal_size((defaultx, defaulty))
-+    return _get_terminal_size((defaultx, defaulty))
diff --git a/dev-python/ipython/ipython-4.0.3.ebuild b/dev-python/ipython/ipython-4.0.3.ebuild
deleted file mode 100644
index 51809b1b3b1d..000000000000
--- a/dev-python/ipython/ipython-4.0.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/qtconsole )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-4.1.2.ebuild b/dev-python/ipython/ipython-4.1.2.ebuild
deleted file mode 100644
index eeaad84ca9e2..000000000000
--- a/dev-python/ipython/ipython-4.1.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	virtx run_tests
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-4.2.0-r1.ebuild b/dev-python/ipython/ipython-4.2.0-r1.ebuild
deleted file mode 100644
index a6dd416aee88..000000000000
--- a/dev-python/ipython/ipython-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	"${FILESDIR}/${P}-only-use-backports-shutil-on-python2.patch"
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	virtx run_tests
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-5.1.0-r1.ebuild b/dev-python/ipython/ipython-5.1.0-r1.ebuild
deleted file mode 100644
index 26ba50bb2029..000000000000
--- a/dev-python/ipython/ipython-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd ${TEST_DIR} > /dev/null || die
-	"${PYTHON}" -m IPython.testing.iptestcontroller --all || die
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-5.2.2.ebuild b/dev-python/ipython/ipython-5.2.2.ebuild
deleted file mode 100644
index 426232e4cfc0..000000000000
--- a/dev-python/ipython/ipython-5.2.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd ${TEST_DIR} > /dev/null || die
-	"${EPYTHON}" -m IPython.testing.iptestcontroller --all || die
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index e4a7d1e271d8..a951b3007825 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,3 +1,2 @@
-DIST jedi-0.10.0.tar.gz 369482 SHA256 d6a7344df9c80562c3f62199278004ccc7c5889be9f1a6aa5abde117ec085123 SHA512 64ff10cf041a107ca709802b41d9ae27b31fc7fa6cff0efdde4c78d01351efdc1333f1a02e2b8004453574199a4651043e7c3fea7149bfe5e3f0e93c23c38320 WHIRLPOOL 298722d855ee40007cd857f9af2dbdd5266fa7b4fcd52a19d378fcefe378edf49c9a3a9f29251a99cc0091d08bc28411e2497479b52e721bffd7105db1e2ec1f
 DIST jedi-0.10.2.tar.gz 373879 SHA256 570aced88bc9ac34d8fa91d3db6de834f45c8adaac3f7fc1a1e9e08e19491acb SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351 WHIRLPOOL 3e3792994d3f6a358f9109ddb288427733268a3b08040975af256ddda802e75f8bf3b924490e996798bddcff70c041a52017b209d796b031bc0437e0c2b3939a
 DIST jedi-0.9.0.tar.gz 334204 SHA256 3b4c19fba31bdead9ab7350fb9fa7c914c59b0a807dcdd5c00a05feb85491d31 SHA512 fa60861bde0afb63c90b0e14b252d33b68d5e83255d662ef727884c91bd530b5a76f0306965ed9620d7d42a92f177feb2524a7b088ade786fb486d62d6912e57 WHIRLPOOL a6233ed19129f129cd97778f1c01bdc1e0747ec1da3611164c50815c77ab57ca1c8d7bec824b00d105cac62d32f53981a54e72b80ddfef00a77cd9316aef94aa
diff --git a/dev-python/jedi/jedi-0.10.0.ebuild b/dev-python/jedi/jedi-0.10.0.ebuild
deleted file mode 100644
index f44c69d3d275..000000000000
--- a/dev-python/jedi/jedi-0.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# skip integration tests
-	rm test/test_integration* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 2bb0f2a55475..e7f53d4d1ebb 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,4 +1,3 @@
-DIST Jinja2-2.8.1.tar.gz 358129 SHA256 35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891 SHA512 0a2e2aa94f5c2f04f79d59d34d5324d2a440385b71192e85e960c761b4a073400e4ab0458e57305650f696a474593d6fbf398fb1d9518be261bb2a5cb866e163 WHIRLPOOL 380636268f903d05afda9c41296986d1c83949dead6c78d3e3cb880137a6c6ec06f0e2297169fc0ea8fd1348c9928f5841d37f951dd941fe89a8ccc96080e191
 DIST Jinja2-2.8.tar.gz 357055 SHA256 bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb WHIRLPOOL 31adc38738848aa224cceb0d0afb2b85eb080d166ed84f145eb0576eeedfb91cf8d99d7c98b6a6cc6ab4fedf33fdbe3171c80fd559df48036a7441232702e749
 DIST jinja-2.9.5.tar.gz 486763 SHA256 86baad86b1210856d784ddf0d243b8fa043f65b1e3cbc07e4fb24cd5b9725d89 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121 WHIRLPOOL 8ef540e81c40b72dbf652b73a63577e052813bc3d263340f55181c9a2320fa8e3f65c37ccaa6f4840d79b63c1c47f12070ae76d61be6fe0a93104e3916a7ff36
 DIST jinja-2.9.6.tar.gz 487185 SHA256 fa4b0ac374a3502d4523673cfdff7a1f6cbd533a13c8050bef6dcd9168142638 SHA512 934e253d9d621fd6d19302ea5e73b571a806c0e31e10ac29b54700ad6649fabf321b00cdc513bb3fb551ee28e83de7f163ce9ef88d232a6c178f4ee5dc2e69b5 WHIRLPOOL f1f576ff18237ef1dddd76c806d4e9256734aeb289aa146c237803e8fc63984dd41e88e8cdb7f45ff9810d9f20c781f040cc04b2cdd02eacb2c35749e5e257ab
diff --git a/dev-python/jinja/jinja-2.8.1.ebuild b/dev-python/jinja/jinja-2.8.1.ebuild
deleted file mode 100644
index d1538441d60a..000000000000
--- a/dev-python/jinja/jinja-2.8.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils distutils-r1
-
-MY_PN=Jinja2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_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 ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-S=${WORKDIR}/${MY_P}
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index a4c7cb6c1f73..839d3fa406be 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
 DIST jsonschema-2.3.0.tar.gz 43115 SHA256 a79dcee3769d7cf749836da840966a83cd2e33e361264e77b74df9490ffe5c89 SHA512 8c39c47c236904d3deb3893d43fd1a9332896e8a1883901ef6040607575250b0d661b010d94be6b0d52515b42e2c7924c93d352ca9b209cec54514e856d95c75 WHIRLPOOL 7f61838ac7173ac2d0dde16f83a864b8dcd82905d139c4de8d7b698ce022f1a63003ff45be53cf134a30747533cb034d2d5d944559a1b6990a37d8073b38d0ea
 DIST jsonschema-2.4.0.tar.gz 48293 SHA256 1298a2f1b2f4c4a7b921cccd159e4e42f6d7b0fb75c86c0cdecfc71f061833fa SHA512 111d60f6b490c016a69bed6b0b22cc6395c949d4510fdcb530757d6e61720cd2e1e3346293a5dd1b6501b262b36510ec08ab4ed76dc7484065e692e041232a93 WHIRLPOOL 1bcec6c3e09f72ad314db49e73d92f854e5f69c490e9ad46b4d0e31564392fb27bf387eec6d376237735396a7da989dcd601e33e2a43e35ed2559fc83b7ebf63
 DIST jsonschema-2.5.1.tar.gz 50855 SHA256 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 SHA512 9e8f6ce16504b7ae7ef1ceb44ecb07eab85923e40967bd8e502b9fa779e772b547db90f56ca951d06591b951e7240db1071e909ac75543d42f6f2495f6de3298 WHIRLPOOL 24da2ad53ecfe9b46d6b9f469719899ddfe54d425aa10e7e83d715e88ee09ba6e80501f1a33dec153af5436fc62abc29ac3ac8af3de6d748e1c007bb771ba642
+DIST jsonschema-2.6.0.tar.gz 53252 SHA256 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 SHA512 03f916abd023b32fbe60f91718d6f2f94d8834bd1bd8ec85ab02f591a145161275c2cde25b037c4d2e94703b870159feb776d3556f011e4c394d2e20ab897b0b WHIRLPOOL 21f52b990c2047ce14889032ea574e8cae46046fabeaf1ce4041e24c6d8eafb93a7832e5bd7a15babff3e18e87a77539e9a7bac0c8f63c907c28d58383cb1ba2
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
new file mode 100644
index 000000000000..216287ec8705
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*' pypy)
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/vcversioner-2.16.0.0[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index aa038c45bbb6..3015b1f40e2c 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,3 @@
 DIST lxml-3.6.0.tar.gz 3693901 SHA256 9c74ca28a7f0c30dca8872281b3c47705e21217c8bc63912d95c9e2a7cac6bdf SHA512 2dd25a4f51e3e71b78e82e32f3838137d8b21936c23c16f901f4180277c4d4b7f14e1f47d306022cc1d13dc2e0b7f405319632e554aa989f551f424cc423d60d WHIRLPOOL 081c97bca209bc234dfb4e439da45ecde1cfd4c2da31384601c96293a5ab5def9d713bee612b4c84a5372d5b9035126ff6cbc496bd56b141f89b6a4fe916540b
 DIST lxml-3.6.4.tar.gz 3707675 SHA256 61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172 SHA512 0412b266d7a70af21f2e4e05d63c3ce63049661ef27e2bf190cbfe1e982b6980fe980a998a360796b958fa9e148ae5bb48136354d4b0bb042055340e37f61e1e WHIRLPOOL b9cd81c885a1b12c36b50f4d616214f1912baed7991a3178e9415bffff74277c849b2e7c82fd7f27fb984148267348f5a72088d0b175ebf2731a16b876988255
-DIST lxml-3.7.1.tar.gz 3788105 SHA256 1c7f6771838300787cfa1bb3ed6512e9dc78e60ecb308a8ed49ac956569c1cca SHA512 1e192671365ba80d76ac2d25b8ec7666e77ceb1339b56b433b55ea0f0c78d0ba8ec381ca2f23eff1b8b1dfc914f47a65d072a4538a69d0b9b77597a6d6ea197b WHIRLPOOL 508f2908e48523c82063841beced2c8ec59e875b4e64e943a64b524bb78d8eb168135d7e066c03c3c5095d3d5f46ed7a104519d6ffb38e3efd7cac9576cbc91a
 DIST lxml-3.7.3.tar.gz 3797713 SHA256 aa502d78a51ee7d127b4824ff96500f0181d3c7826e6ee7b800d068be79361c7 SHA512 9bf1142e81b6e1c8a47e296774d7e448d9ed47de3672f7442cc33274b07252baa47a9346efa9d2fda7b7bb66beb95bbc81f0ae16c9f808ff568f330991dd6d13 WHIRLPOOL d3881f308622ed8beb03a59bbf8256a55b92f5cf41c2c9a0c65c1e53acceea33ab93f420151330b09e8dbde3f717d5c095aa0275406355ec4a17105de46b6bae
diff --git a/dev-python/lxml/lxml-3.7.1.ebuild b/dev-python/lxml/lxml-3.7.1.ebuild
deleted file mode 100644
index dd87a7e68ec2..000000000000
--- a/dev-python/lxml/lxml-3.7.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-
-	# This patch removes a testcase that fails because of issues
-	# in libxml2.
-	#
-	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
-	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 12364119a57b..fdafc1a10544 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,6 +1,3 @@
 DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
-DIST Markdown-2.6.3.tar.gz 301441 SHA256 ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af SHA512 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee WHIRLPOOL 8d50fa6895a117c081f1ccb5cfc456a297a8ff36e1597add78fbd8acfd4b72f79c617c5bffc790bc7c6d76f7aefef5706b8d8083f4104500f4b5c035aa14546d
-DIST Markdown-2.6.4.tar.gz 301632 SHA256 e436eee7aaf2a230ca3315034dd39e8a0fc27036708acaa3dd70625ec62a94ce SHA512 5fc4ada494880871833046ef9a115385542002e6ec104847353fb2638fce6e46f2bb54ff37bd7d43eb100a448dc424ac425937cadc9ec1d81ea9e70887d8e460 WHIRLPOOL ca0d39b8cbbc124a5a6a4324d627c66d717e1f4c4c43c09d9ff208a23b56b6de79ed7b5cf9a57a2c598a3f40810d4691d42dcbf48690c58d13f38adb8e318490
 DIST Markdown-2.6.5.tar.gz 301781 SHA256 8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3 WHIRLPOOL 752414989f7b3ba04f4f4d8b9f855c9d64f816c61b4d6333e1b3c15b2aadf6579f1b1f0a686ca3eccfc3fcdaac8007c6655a0f331d795a8a0b07ef83dda2465c
-DIST Markdown-2.6.6.tar.gz 302566 SHA256 9a292bb40d6d29abac8024887bcfc1159d7a32dc1d6f1f6e8d6d8e293666c504 SHA512 cbe9343130e5200f8b5a796e5b9948a27d2bc7896b664d6656827bc0b05abfa5204eefa5eed02afd361b58a72defcf237dc5fd3033586d4465d109b4429caaec WHIRLPOOL 79b46078b96d4bade5ac7bf2cc8f938d643392e8d49920a7767c74f4c7f44d11d00ac32c3f53494dfe75475666858b0480428b6dec69f1cfb05a54a9fcdedd82
 DIST Markdown-2.6.8.tar.gz 307330 SHA256 0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23 WHIRLPOOL a7472b1feb23db0b6fbf8826979d1f82ad6e84dd6d33b66e4bfba9c2914ff10ec278d444aa8ab740d1d290cb1bd6682cb4f6e9cedf66c5cae8d0a5f96cfd4804
diff --git a/dev-python/markdown/markdown-2.6.3.ebuild b/dev-python/markdown/markdown-2.6.3.ebuild
deleted file mode 100644
index cfb17d699881..000000000000
--- a/dev-python/markdown/markdown-2.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
-	https://pythonhosted.org/Markdown/
-	https://github.com/waylan/Python-Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.4.ebuild b/dev-python/markdown/markdown-2.6.4.ebuild
deleted file mode 100644
index cfb17d699881..000000000000
--- a/dev-python/markdown/markdown-2.6.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
-	https://pythonhosted.org/Markdown/
-	https://github.com/waylan/Python-Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.6.ebuild b/dev-python/markdown/markdown-2.6.6.ebuild
deleted file mode 100644
index 70d2a459aecd..000000000000
--- a/dev-python/markdown/markdown-2.6.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	http://www.freewisdom.org/projects/python-markdown
-	https://pypi.python.org/pypi/Markdown
-	https://pythonhosted.org/Markdown/
-	https://github.com/waylan/Python-Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ac1be133fae3..fde7fcea9760 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,4 +1,2 @@
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
-DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f
-DIST matplotlib-1.5.1.tar.gz 54031672 SHA256 3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40 SHA512 a0e78b5027a3a49cf8e77dc0d26f5f380dcd80f7b309b6121199acd5e1d94f48482864a9eee3bd397f7ac6f07fe1d3c21bf517217df3c72e8e3d105b7c2ae58e WHIRLPOOL 5d56b1e17542d01ea58cbe6a085fae930dd71dac793260fd418633d1364ab7822d5a0ef16041260637f2472b1d9276c002f84603ab655573b7d8058d959475cd
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
diff --git a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch
deleted file mode 100644
index d5a4ae39bad5..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
-+++ setupext.py	2013-08-02 09:40:14.785304342 +0200
-@@ -749,22 +749,7 @@
-             return str(e) + ' Using local copy.'
- 
-     def add_flags(self, ext):
--        if self.found_external:
--            pkg_config.setup_extension(ext, 'libagg')
--        else:
--            ext.include_dirs.append('agg24/include')
--            agg_sources = [
--                'agg_bezier_arc.cpp',
--                'agg_curves.cpp',
--                'agg_image_filters.cpp',
--                'agg_trans_affine.cpp',
--                'agg_vcgen_contour.cpp',
--                'agg_vcgen_dash.cpp',
--                'agg_vcgen_stroke.cpp',
--                'agg_vpgen_segmentator.cpp'
--                ]
--            ext.sources.extend(
--                os.path.join('agg24', 'src', x) for x in agg_sources)
-+        pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
- 
- 
- class FreeType(SetupPackage):
diff --git a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch
deleted file mode 100644
index c27922eb11d6..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setupext.py b/setupext.py
-index 7b629b6..8131bb1 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -674,16 +674,9 @@ class CXX(SetupPackage):
-     name = 'pycxx'
- 
-     def check(self):
--        if sys.version_info[0] >= 3:
--            # There is no version of PyCXX in the wild that will work
--            # with Python 3.x
--            self.__class__.found_external = False
--            return ("Official versions of PyCXX are not compatible with "
--                    "Python 3.x.  Using local copy")
--
-         self.__class__.found_external = True
-         old_stdout = sys.stdout
--        sys.stdout = io.BytesIO()
-+        #sys.stdout = io.BytesIO()
-         try:
-             import CXX
-         except ImportError:
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch
deleted file mode 100644
index 19c111d87962..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b7dfa4fa7a69d091dac0ead295d28422c4e33b45 Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell <tcaswell@gmail.com>
-Date: Sun, 24 Jan 2016 13:05:18 -0500
-Subject: [PATCH] Merge pull request #5872 from jenshnielsen/sphinx134
-
-DOC: Fix issue with Sphinx 1.3.4
-
-Discarded changes to .travis.yml from #5872
----
- lib/matplotlib/dviread.py |  2 +-
- lib/matplotlib/patches.py | 18 ++++++++++++------
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
-index db6e976..1141f6a 100644
---- a/lib/matplotlib/dviread.py
-+++ b/lib/matplotlib/dviread.py
-@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None):
-     """
-     Call :program:`kpsewhich` to find a file in the texmf tree. If
-     *format* is not None, it is used as the value for the
--    :option:`--format` option.
-+    `--format` option.
- 
-     Apparently most existing TeX distributions on Unix-like systems
-     use kpathsea. I hear MikTeX (a popular distribution on Windows)
-diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
-index b8b7363..917eca7 100644
---- a/lib/matplotlib/patches.py
-+++ b/lib/matplotlib/patches.py
-@@ -2992,15 +2992,21 @@ class Bar(_Base):
- 
-         def __init__(self, armA=0., armB=0., fraction=0.3, angle=None):
-             """
--            *armA* : minimum length of armA
-+            Parameters
-+            ----------
-+            armA : float
-+                minimum length of armA
- 
--            *armB* : minimum length of armB
-+            armB : float
-+                minimum length of armB
- 
--            *fraction* : a fraction of the distance between two points that
--                         will be added to armA and armB.
-+            fraction : float
-+                a fraction of the distance between two points that
-+                will be added to armA and armB.
- 
--            *angle* : angle of the connecting line (if None, parallel to A
--                      and B)
-+            angle : float or None
-+                angle of the connecting line (if None, parallel
-+                to A and B)
-             """
-             self.armA = armA
-             self.armB = armB
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch
deleted file mode 100644
index c850d090f79d..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c28e1b0aebe19b7db292eb7c1b6deba8af6754e0 Mon Sep 17 00:00:00 2001
-From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
-Date: Wed, 13 Jan 2016 13:48:06 +0000
-Subject: [PATCH] Fix new pep8 issue in legend_demo5
-
----
- examples/pylab_examples/legend_demo5.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py
-index 699babe..5668966 100644
---- a/examples/pylab_examples/legend_demo5.py
-+++ b/examples/pylab_examples/legend_demo5.py
-@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
-                 lw = orig_handle.get_linewidths()[i]
-             except IndexError:
-                 lw = orig_handle.get_linewidths()[0]
--            if dashes[0] != None:
-+            if dashes[0] is not None:
-                 legline.set_dashes(dashes[1])
-             legline.set_color(color)
-             legline.set_transform(trans)
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch
deleted file mode 100644
index d031e5aeee66..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 72cf5b80537157decc741d81db550e6cf82648f6 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom@gmail.com>
-Date: Mon, 11 Jan 2016 16:48:04 -0500
-Subject: [PATCH] Fix #5829.  Update the baseline image.
-
----
- .../baseline_images/test_image/rasterize_10dpi.svg | 56 ++++++++++------------
- 1 file changed, 26 insertions(+), 30 deletions(-)
-
-diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
-index 47e354d..1f73c8f 100644
---- a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
-+++ b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
-@@ -5,31 +5,29 @@
- <svg height="72pt" version="1.1" viewBox="0 0 216 72" width="216pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-   <style type="text/css">
--*{stroke-linecap:butt;stroke-linejoin:round;}
-+*{stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:100000;}
-   </style>
-  </defs>
-  <g id="figure_1">
-   <g id="patch_1">
--   <path d="
--M0 72
--L216 72
--L216 0
--L0 0
-+   <path d="M 0 72 
-+L 216 72 
-+L 216 0 
-+L 0 0 
- z
- " style="fill:#ffffff;"/>
-   </g>
-   <g id="axes_1">
-    <g id="patch_2">
--    <path d="
--M27 60.6176
--L76.2353 60.6176
--L76.2353 11.3824
--L27 11.3824
-+    <path d="M 27 60.617647 
-+L 76.235294 60.617647 
-+L 76.235294 11.382353 
-+L 27 11.382353 
- z
- " style="fill:#ffffff;"/>
-    </g>
--   <g clip-path="url(#pc31db6f15f)">
--    <image height="50.4" id="image2c20c31ecf" width="57.6" x="27.0" xlink:href="data:image/png;base64,
-+   <g clip-path="url(#p306f09a014)">
-+    <image height="50.4" id="image207c5863ce" width="57.6" x="27.0" xlink:href="data:image/png;base64,
- iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmFzjkKwlAAhOEvKi5FMLU2HkEQwdbSU3knL+EBLMUFQayCUaMYF55FQEsH/mYYZiZiGkA3Ydj70UlAxR/Vhv09eLfPivipuOUe69QrjcvAZLwE99CShYPsnMgWiSI0QTSfdQNcjjWHTeNLnlXLhtGgnDju2KbEV+orTqX9/+QHCXAwPEkx7O0AAAAASUVORK5CYII=" y="10.2176470588"/>
-    </g>
-    <g id="matplotlib.axis_1"/>
-@@ -37,43 +35,41 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmF
-   </g>
-   <g id="axes_2">
-    <g id="patch_3">
--    <path d="
--M86.0824 64.8
--L135.318 64.8
--L135.318 7.2
--L86.0824 7.2
-+    <path d="M 86.082353 64.8 
-+L 135.317647 64.8 
-+L 135.317647 7.2 
-+L 86.082353 7.2 
- z
- " style="fill:#ffffff;"/>
-    </g>
--   <image height="64.8" id="image1d9f73e233" width="136.8" x="79.2" xlink:href="data:image/png;base64,
--iVBORw0KGgoAAAANSUhEUgAAABMAAAAJCAYAAADQHRcxAAAABHNCSVQICAgIfAhkiAAAAHNJREFUKJG10kENwlAQBuH5OVQBImoBAzVQA1hABxoQUAUYqIWaqIRepqdHmoaE9AGbzGU3+U4blV/N6d0yoUnoE56HNPUV2IJ3cAYF3d4/VZArOBZgWw22RxZwALtvsAm8gecjyB57gBcwNUgpf3+N2lkBB3gBDVzLDTYAAAAASUVORK5CYII=" y="7.2"/>
-+   <image height="43.2" id="image2e9ed63e7b" width="50.4" x="86.39999999999999" xlink:href="data:image/png;base64,
-+iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAABHNCSVQICAgIfAhkiAAAAFVJREFUCJllzjEVwlAAxdDbBQUVgQUMYAADWKgONCAABRjAQk0ggSUdGPoPDFnyhjyVETrQhZ6jPNKN3tQXXem1i5F/+aEHncdxpYXmPaU7nWj6PbcBc+lWnSEOzhQAAAAASUVORK5CYII=" y="14.4"/>
-    <g id="matplotlib.axis_3"/>
-    <g id="matplotlib.axis_4"/>
-   </g>
-   <g id="axes_3">
-    <g id="patch_4">
--    <path d="
--M145.165 64.8
--L194.4 64.8
--L194.4 7.2
--L145.165 7.2
-+    <path d="M 145.164706 64.8 
-+L 194.4 64.8 
-+L 194.4 7.2 
-+L 145.164706 7.2 
- z
- " style="fill:#ffffff;"/>
-    </g>
-    <g id="line2d_1">
--    <path clip-path="url(#p19b1e86336)" d="
--M145.165 45.6
--L194.4 26.4" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
-+    <path clip-path="url(#pef029be595)" d="M 145.164706 45.6 
-+L 194.4 26.4 
-+" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
-    </g>
-    <g id="matplotlib.axis_5"/>
-    <g id="matplotlib.axis_6"/>
-   </g>
-  </g>
-  <defs>
--  <clipPath id="p19b1e86336">
-+  <clipPath id="pef029be595">
-    <rect height="57.6" width="49.2352941176" x="145.164705882" y="7.2"/>
-   </clipPath>
--  <clipPath id="pc31db6f15f">
-+  <clipPath id="p306f09a014">
-    <rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/>
-   </clipPath>
-  </defs>
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
deleted file mode 100644
index 53b90641e0d9..000000000000
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/qhull
-	cairo? (
-		|| (
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/cairocffi[${PYTHON_USEDEP}]
-			)
-		)
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.3.4
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	# suggested by upstream
-#	sed \
-#		-e '/tol/s:32:35:g' \
-#		-i lib/matplotlib/tests/test_mathtext.py || die
-
-	sed \
-		-e "s:/usr/:${EPREFIX}/usr/:g" \
-		-i setupext.py || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
-		[directories]
-		basedirlist = "${EPREFIX}/usr"
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[gui_support]
-		agg = True
-		$(use_setup cairo)
-		$(use_setup pyside)
-		$(use_setup qt4)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if $(python_is_python3); then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-			six = False
-			$(use_setup fltk)
-			$(use_setup gtk2 gtk)
-			$(use_setup gtk3)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	export MPLSETUPCFG
-	unset DISPLAY
-
-	# Note: remove build... if switching to out-of-source build
-	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		"${PYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	#cd "${TMPDIR}" || die
-	VIRTUALX_COMMAND="${PYTHON}"
-	virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
-		die "Tests fail with ${EPYTHON}"
-#	VIRTUALX_COMMAND=esetup.py
-#	virtualmake test
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
deleted file mode 100644
index 4be84aed2a43..000000000000
--- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/qhull
-	cairo? (
-		|| (
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/cairocffi[${PYTHON_USEDEP}]
-			)
-		)
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-1.4.3-backport.patch
-	"${FILESDIR}"/${P}-test-fix-backport.patch
-	"${FILESDIR}"/${P}-test-fix-backport-2.patch
-	)
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	# suggested by upstream
-#	sed \
-#		-e '/tol/s:32:35:g' \
-#		-i lib/matplotlib/tests/test_mathtext.py || die
-
-	sed \
-		-e "s:/usr/:${EPREFIX}/usr/:g" \
-		-i setupext.py || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
-		[directories]
-		basedirlist = "${EPREFIX}/usr"
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[gui_support]
-		agg = True
-		$(use_setup cairo)
-		$(use_setup pyside)
-		$(use_setup qt4)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if $(python_is_python3); then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-			six = False
-			$(use_setup fltk)
-			$(use_setup gtk2 gtk)
-			$(use_setup gtk3)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	export MPLSETUPCFG
-	unset DISPLAY
-
-	# Note: remove build... if switching to out-of-source build
-	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		"${PYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-#	virtx ${PYTHON} tests.py \
-#		--no-pep8 \
-#		--no-network \
-#		--verbose \
-#		--processes=$(makeopts_jobs)
-
-	virtx "${PYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 824172d2e506..0b7f575c04fe 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,7 +1,2 @@
 DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8
-DIST mccabe-0.3.1.tar.gz 7586 SHA256 5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16 SHA512 83a5cb389343628b8a464f8f17452f116557735ed0a5f40411fe06f63af1f7c5ac4501fce2617a22fc7fb8395918deda2afba39728c1e72713930f14dddf08f9 WHIRLPOOL 2f8354395d9c291377ec8cac9f7911ffdeaf348f37ab7a0b3a87fb10ec0490e4e398963c02989de5240d54e1e4c34945fe15ad60c0b8605d5b8367f6efe7e72b
-DIST mccabe-0.3.tar.gz 6127 SHA256 3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c SHA512 3bb176d486de5e0d3de8db0bf923b4b03e5ad2fd82df079babd6e6551afe9077b956698ac335f23d340a16212d73c1c5ab5a3055d2788b7f81040f3cb0d1b4ee WHIRLPOOL bfa0480cca9cc082f60c20d07d6edac203c5e9144f2caf57576304dbf01c8a96b19e111f9e1abe5774a4de235729d69c3c89d4fddf8213f403568228e92f38f6
-DIST mccabe-0.4.0.tar.gz 7916 SHA256 9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b SHA512 4a7158a3a28eed0a98ae64b3a0394542f263c9b4e08fc31ad47b2317ba434b1002e13d40a9766e4e39ea798aa35e83a79b81936cebdaabdae582160f1780e1a2 WHIRLPOOL d3b1ce9613ababb86f54e392fb9a5b5e96de7226ce6a3d6fd1c72ae2985c2dfe27319851ddaf8140b3b4f92f1b44f02683b88a2237539d5495199b479b267303
-DIST mccabe-0.5.2.tar.gz 8366 SHA256 3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff SHA512 08dbfadc4d270e5fe58492536a27d9008efd61c77aac817b2d77b9b4510cccb41e76e1e016ff1228ebe3ac6ea1cc6ce396601f6a692388e981ddba2549288e01 WHIRLPOOL 715242d4f242a1055b7e10abc3f03103bc221f3344682e0bdecb0e8eb7bdcd27812451c79ce68e4e3cdf8df7d514420acc31bf5aa0559ea41f17eb76a72c4b38
-DIST mccabe-0.5.3.tar.gz 8460 SHA256 16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e SHA512 c1985deb9c8067948430b553bf28b06e2db32c45e765b7d1733cfd4526c4829572240f809d0f661bc1ba593687d7c1596446d53bbef3a670aa1c4b3492076deb WHIRLPOOL 75414ff2a2ae82d88eb7513afa1a958a0fc13d154013e633bff42a581046c8d464dd3103aea22d73c1ba19bd89c2802f5c22e71878eaf5854da9266e0750d5b2
 DIST mccabe-0.6.1.tar.gz 8612 SHA256 dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8 WHIRLPOOL fb57eebe4b20af1dbd81f0e62d00ea64b3e998f1549de3f06ed65d3c244f671d0668fc630c3105639fd351534f8dffe3c093d7e32a3f17400f210b1f286f38bd
diff --git a/dev-python/mccabe/mccabe-0.3.1.ebuild b/dev-python/mccabe/mccabe-0.3.1.ebuild
deleted file mode 100644
index 398edd4db404..000000000000
--- a/dev-python/mccabe/mccabe-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} test_mccabe.py || die
-}
diff --git a/dev-python/mccabe/mccabe-0.3.ebuild b/dev-python/mccabe/mccabe-0.3.ebuild
deleted file mode 100644
index 8f5b8175f64a..000000000000
--- a/dev-python/mccabe/mccabe-0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mccabe/mccabe-0.4.0.ebuild b/dev-python/mccabe/mccabe-0.4.0.ebuild
deleted file mode 100644
index 45a2009cbed8..000000000000
--- a/dev-python/mccabe/mccabe-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/mccabe/mccabe-0.5.2.ebuild b/dev-python/mccabe/mccabe-0.5.2.ebuild
deleted file mode 100644
index 37a609a9c6e4..000000000000
--- a/dev-python/mccabe/mccabe-0.5.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/mccabe/mccabe-0.5.3.ebuild b/dev-python/mccabe/mccabe-0.5.3.ebuild
deleted file mode 100644
index 95e58ed95193..000000000000
--- a/dev-python/mccabe/mccabe-0.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index b6cd8fd97e68..c4ead5461d94 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,3 +1,2 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 SHA256 3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3 SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3 WHIRLPOOL f83328743b16ae46263e05055d6400617b7858e11837ce892919e26a36348650122b78ee366125a1793b20fa71c641b3606bf834d2936f98dab65b89b740385b
-DIST python-mimeparse-1.5.2.tar.gz 5870 SHA256 bef134a59598cc6aa598f84553162aa7a0c01f3f431588225bb9a208964b1827 SHA512 e11c28d627da4a12075ebc427813476ef32585cfeeb323c852e80f1fb8e987324ffab8a314e5249fe689460a457189d6cd252241b81a1d2d8216256d4976df14 WHIRLPOOL 9f1e290f37ab4e4cf0785c2188882bee7f660f533718b6c19867f12f0213f3a59a783559e98d86955f587c9e6d9b15de5b93cf3d1712e65c7b8e0248463d2ffa
 DIST python-mimeparse-1.6.0.tar.gz 6541 SHA256 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e WHIRLPOOL 76fae536b6c27f5a13eaca1ce26fde1e2e3c66573ef7a011ce0920f1a169559adc5fb2391e6649ec5ea9319e2c124b5f506139310f9a84851704e3818293d358
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
deleted file mode 100644
index 559dfa3db277..000000000000
--- a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="
-	https://code.google.com/p/mimeparse
-	https://github.com/dbtsai/python-mimeparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	local pyver=$("${EPYTHON}" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_version())")
-	python_export PYTHON_SITEDIR
-
-	# Previous versions were just called 'mimeparse'
-	ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \
-		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link"
-}
diff --git a/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild b/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild
deleted file mode 100644
index 559dfa3db277..000000000000
--- a/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="
-	https://code.google.com/p/mimeparse
-	https://github.com/dbtsai/python-mimeparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	local pyver=$("${EPYTHON}" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_version())")
-	python_export PYTHON_SITEDIR
-
-	# Previous versions were just called 'mimeparse'
-	ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \
-		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link"
-}
diff --git a/dev-python/nose/nose-1.3.7-r2.ebuild b/dev-python/nose/nose-1.3.7-r2.ebuild
deleted file mode 100644
index e9ee6389ef9c..000000000000
--- a/dev-python/nose/nose-1.3.7-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.python.org/pypi/nose
-	http://readthedocs.org/docs/nose/
-	https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-REQUIRED_USE="
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( doc/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 856d490efce2..fb2e3d0f0c84 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,11 +1,7 @@
-DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
-DIST numpy-1.10.2.tar.gz 4055005 SHA256 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 SHA512 040db49593f3c53c9b43301eacffc3b5817310f1dbb91fd650efcf5ba65ce7e217549dc5268bc56846f19f1a03dd19470989005aa176531af44d602b3546b007 WHIRLPOOL 30c4b365aac6623241afd72fc30d3a543183205eb23db1366937e39fc50dee862923dd249775fee67cce0199940a57ec1423f1cb0e65ff7c65764c7969d7a76f
 DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
-DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d
 DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
-DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093
 DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
 DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
deleted file mode 100644
index 77a3c010371f..000000000000
--- a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 3a816a4db9b498eb64eb837fdcca0fa8ddbe063e Mon Sep 17 00:00:00 2001
-From: Allan Haldane <allan.haldane@gmail.com>
-Date: Sat, 17 Oct 2015 14:00:36 -0400
-Subject: [PATCH] BUG: recarrays viewed as subarrays don't convert to np.record
- type
-
-Record array views were updated in #5943 to return np.record dtype
-where possible, but forgot about the case of sub-arrays.
-
-That's fixed here, so accessing subarray fields by attribute or index
-works sensibly, as well as viewing a record array as a subarray dtype,
-and printing subarrays.
-
-This also happens to fix #6459, since it affects the same lines.
-
-Fixes #6497 #6459
----
- numpy/core/records.py            | 30 +++++++++++++++++++-----------
- numpy/core/tests/test_records.py | 23 +++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 11 deletions(-)
-
-diff --git a/numpy/core/records.py b/numpy/core/records.py
-index 4a99553..4ce3fe9 100644
---- a/numpy/core/records.py
-+++ b/numpy/core/records.py
-@@ -448,12 +448,14 @@ def __getattribute__(self, attr):
- 
-         # At this point obj will always be a recarray, since (see
-         # PyArray_GetField) the type of obj is inherited. Next, if obj.dtype is
--        # non-structured, convert it to an ndarray. If obj is structured leave
--        # it as a recarray, but make sure to convert to the same dtype.type (eg
--        # to preserve numpy.record type if present), since nested structured
--        # fields do not inherit type.
-+        # non-structured, convert it to an ndarray. Then if obj is structured
-+        # with void type convert it to the same dtype.type (eg to preserve
-+        # numpy.record type if present), since nested structured fields do not
-+        # inherit type. Don't do this for non-void structures though.
-         if obj.dtype.fields:
--            return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
-+            if issubclass(obj.dtype.type, nt.void):
-+                return obj.view(dtype=(self.dtype.type, obj.dtype))
-+            return obj
-         else:
-             return obj.view(ndarray)
- 
-@@ -463,8 +465,9 @@ def __getattribute__(self, attr):
-     # Thus, you can't create attributes on-the-fly that are field names.
-     def __setattr__(self, attr, val):
- 
--        # Automatically convert (void) dtypes to records.
--        if attr == 'dtype' and issubclass(val.type, nt.void):
-+        # Automatically convert (void) structured types to records
-+        # (but not non-void structures, subarrays, or non-structured voids)
-+        if attr == 'dtype' and issubclass(val.type, nt.void) and val.fields:
-             val = sb.dtype((record, val))
- 
-         newattr = attr not in self.__dict__
-@@ -499,7 +502,9 @@ def __getitem__(self, indx):
-         # we might also be returning a single element
-         if isinstance(obj, ndarray):
-             if obj.dtype.fields:
--                return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
-+                if issubclass(obj.dtype.type, nt.void):
-+                    return obj.view(dtype=(self.dtype.type, obj.dtype))
-+                return obj
-             else:
-                 return obj.view(type=ndarray)
-         else:
-@@ -519,11 +524,14 @@ def __repr__(self):
-             # If this is a full record array (has numpy.record dtype),
-             # or if it has a scalar (non-void) dtype with no records,
-             # represent it using the rec.array function. Since rec.array
--            # converts dtype to a numpy.record for us, use only dtype.descr,
--            # not repr(dtype).
-+            # converts dtype to a numpy.record for us, convert back
-+            # to non-record before printing
-+            plain_dtype = self.dtype
-+            if plain_dtype.type is record:
-+                plain_dtype = sb.dtype((nt.void, plain_dtype))
-             lf = '\n'+' '*len("rec.array(")
-             return ('rec.array(%s, %sdtype=%s)' %
--                          (lst, lf, repr(self.dtype.descr)))
-+                          (lst, lf, plain_dtype))
-         else:
-             # otherwise represent it using np.array plus a view
-             # This should only happen if the user is playing
-diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
-index 7a18f29..290bc4f 100644
---- a/numpy/core/tests/test_records.py
-+++ b/numpy/core/tests/test_records.py
-@@ -121,6 +121,23 @@ def test_recarray_views(self):
-         assert_equal(type(rv), np.recarray)
-         assert_equal(rv.dtype.type, np.record)
- 
-+        # check that accessing nested structures keep record type, but
-+        # not for subarrays, non-void structures, non-structured voids
-+        test_dtype = [('a', 'f4,f4'), ('b', 'V8'), ('c', ('f4',2)),
-+                      ('d', ('i8', 'i4,i4'))]
-+        r = np.rec.array([((1,1), b'11111111', [1,1], 1),
-+                          ((1,1), b'11111111', [1,1], 1)], dtype=test_dtype)
-+        assert_equal(r.a.dtype.type, np.record)
-+        assert_equal(r.b.dtype.type, np.void)
-+        assert_equal(r.c.dtype.type, np.float32)
-+        assert_equal(r.d.dtype.type, np.int64)
-+        # check the same, but for views
-+        r = np.rec.array(np.ones(4, dtype='i4,i4'))
-+        assert_equal(r.view('f4,f4').dtype.type, np.record)
-+        assert_equal(r.view(('i4',2)).dtype.type, np.int32)
-+        assert_equal(r.view('V8').dtype.type, np.void)
-+        assert_equal(r.view(('i8', 'i4,i4')).dtype.type, np.int64)
-+
-         #check that we can undo the view
-         arrs = [np.ones(4, dtype='f4,i4'), np.ones(4, dtype='f8')]
-         for arr in arrs:
-@@ -135,6 +152,12 @@ def test_recarray_repr(self):
-         a = np.array(np.ones(4, dtype='f8'))
-         assert_(repr(np.rec.array(a)).startswith('rec.array'))
- 
-+        # check that the 'np.record' part of the dtype isn't shown
-+        a = np.rec.array(np.ones(3, dtype='i4,i4'))
-+        assert_equal(repr(a).find('numpy.record'), -1)
-+        a = np.rec.array(np.ones(3, dtype='i4'))
-+        assert_(repr(a).find('dtype=int32') != -1)
-+
-     def test_recarray_from_names(self):
-         ra = np.rec.array([
-             (1, 'abc', 3.7000002861022949, 0),
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
deleted file mode 100644
index 9c33704f8e22..000000000000
--- a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0d25dc4175e00cdaf9545e8b1b1a5b879cf67248 Mon Sep 17 00:00:00 2001
-From: Ethan Kruse <eakruse@uw.edu>
-Date: Mon, 19 Oct 2015 13:29:01 -0700
-Subject: [PATCH 1/2] Potential fix for #6462
-
----
- numpy/lib/function_base.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
-index 555d083..fef69df 100644
---- a/numpy/lib/function_base.py
-+++ b/numpy/lib/function_base.py
-@@ -3339,7 +3339,7 @@ def _median(a, axis=None, out=None, overwrite_input=False):
-         indexer[axis] = slice(index-1, index+1)
- 
-     # Check if the array contains any nan's
--    if np.issubdtype(a.dtype, np.inexact):
-+    if np.issubdtype(a.dtype, np.inexact) and sz > 0:
-         # warn and return nans like mean would
-         rout = mean(part[indexer], axis=axis, out=out)
-         part = np.rollaxis(part, axis, part.ndim)
-
-From 59d859fb2160950ac93267d7461ad952145c8724 Mon Sep 17 00:00:00 2001
-From: Ethan Kruse <eakruse@uw.edu>
-Date: Tue, 20 Oct 2015 11:40:49 -0700
-Subject: [PATCH 2/2] Added tests for median of empty arrays
-
----
- numpy/lib/tests/test_function_base.py | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
-index 4516c92..aa41c1f 100644
---- a/numpy/lib/tests/test_function_base.py
-+++ b/numpy/lib/tests/test_function_base.py
-@@ -2597,6 +2597,36 @@ def test_nan_behavior(self):
-             assert_equal(np.median(a, (0, 2)), b)
-             assert_equal(len(w), 1)
- 
-+    def test_empty(self):
-+        # empty arrays
-+        a = np.array([], dtype=float)
-+        with warnings.catch_warnings(record=True) as w:
-+            warnings.filterwarnings('always', '', RuntimeWarning)
-+            assert_equal(np.median(a), np.nan)
-+            assert_(w[0].category is RuntimeWarning)
-+
-+        # multiple dimensions
-+        a = np.array([], dtype=float, ndmin=3)
-+        # no axis
-+        with warnings.catch_warnings(record=True) as w:
-+            warnings.filterwarnings('always', '', RuntimeWarning)
-+            assert_equal(np.median(a), np.nan)
-+            assert_(w[0].category is RuntimeWarning)
-+
-+        # axis 0 and 1
-+        b = np.array([], dtype=float, ndmin=2)
-+        with warnings.catch_warnings(record=True) as w:
-+            warnings.filterwarnings('always', '', RuntimeWarning)
-+            assert_equal(np.median(a, axis=0), b)
-+            assert_equal(np.median(a, axis=1), b)
-+
-+        # axis 2
-+        b = np.array(np.nan, dtype=float, ndmin=2)
-+        with warnings.catch_warnings(record=True) as w:
-+            warnings.filterwarnings('always', '', RuntimeWarning)
-+            assert_equal(np.median(a, axis=2), b)
-+            assert_(w[0].category is RuntimeWarning)
-+
-     def test_object(self):
-         o = np.arange(7.)
-         assert_(type(np.median(o.astype(object))), float)
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
deleted file mode 100644
index 1f6f9c4c0962..000000000000
--- a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- numpy-1.11.1/numpy/distutils/system_info.py
-+++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,26 +312,7 @@
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
-@@ -669,10 +650,7 @@
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         static_exts = ['.a']
-@@ -1685,7 +1663,7 @@
-             lib = self.has_cblas(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = [lib]
-+                info['libraries'] = lib
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
-@@ -1718,16 +1696,16 @@
-                 # check for cblas lib, and if not present check for blas lib.
-                 try:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
-+                                      libraries=info["libraries"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
-+                    res = info["libraries"]
-                 except distutils.ccompiler.LinkError:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-                                       libraries=["blas"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                    res = ["blas"]
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally:
diff --git a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
deleted file mode 100644
index 80b710b5b532..000000000000
--- a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d0ce36e5be134bb5ead03cab1edeaa60fa355aa Mon Sep 17 00:00:00 2001
-From: Jonathan Helmus <jjhelmus@gmail.com>
-Date: Wed, 12 Oct 2016 13:07:42 -0500
-Subject: [PATCH] BUG: import full module path in npy_load_module
-
-Use the full module path when importing importlib.machinery for use in the
-npy_load_module function. Just importing importlib is not sufficient in certain
-cases, for example Python 3.4.
-
-closes #8147
----
- numpy/compat/py3k.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
-index 25cc535..d5bb2e4 100644
---- a/numpy/compat/py3k.py
-+++ b/numpy/compat/py3k.py
-@@ -118,7 +118,7 @@ def npy_load_module(name, fn, info=None):
-         mod : module
- 
-         """
--        import importlib
-+        import importlib.machinery
-         return importlib.machinery.SourceFileLoader(name, fn).load_module()
- else:
-     def npy_load_module(name, fn, info=None):
diff --git a/dev-python/numpy/numpy-1.10.1-r1.ebuild b/dev-python/numpy/numpy-1.10.1-r1.ebuild
deleted file mode 100644
index 822c5cb22f26..000000000000
--- a/dev-python/numpy/numpy-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
-	"${FILESDIR}"/${P}-backport-1.patch
-	"${FILESDIR}"/${P}-backport-2.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.10.2-r2.ebuild b/dev-python/numpy/numpy-1.10.2-r2.ebuild
deleted file mode 100644
index 9aade7307f82..000000000000
--- a/dev-python/numpy/numpy-1.10.2-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.10.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-#	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-#	# we don't have f2py-3.3
-	sed \
-		-e 's:test_f2py:_&:g' \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
-
-	if use doc; then
-		HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-
-	docinto f2py
-	dodoc doc/f2py/*.txt
-	doman doc/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild
deleted file mode 100644
index 7d10708997cb..000000000000
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.11.0"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.11.0
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
-	"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
-	# This has been fixed upstream but no new release yet
-	# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
-	"${FILESDIR}"/${P}-import-module-fix.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e 's:test_f2py:_&:g' \
-		-i numpy/tests/test_scripts.py || die
-
-	# QA bug 590464
-	# The .py files from numpy/core/tests are just added, instead
-	# of being bytecode compiled as a proper subdir package.
-	# We trick the buildsystem into accepting it as a bytecode
-	# package by adding a setup.py and an empty __init__.py
-	#cp numpy/{compat/setup.py,core/tests} || die
-	#touch numpy/core/tests/__init__.py || die
-	#sed \
-	#	-e 's:compat:tests:' \
-	#	-i numpy/core/tests/setup.py || die
-	#sed \
-	#	-e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
-	#	-i numpy/core/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	DOCS+=( THANKS.txt )
-
-	if use doc; then
-		HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-
-	docinto f2py
-	dodoc doc/f2py/*.txt
-	doman doc/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.9.3.ebuild b/dev-python/numpy/numpy-1.9.3.ebuild
deleted file mode 100644
index 30c02d23dd6d..000000000000
--- a/dev-python/numpy/numpy-1.9.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 9893c5dac481..c40a18150bdc 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,3 +1 @@
-DIST numpydoc-0.4.tar.gz 28972 SHA256 20e07c60766a7a044f228de5bdcc0d10b84a9f0b460e0c09422a4f60ef21ff8f SHA512 980c3f56562b0faff4a8f453faff36d8ed92ca7241174c16fe0cc7d60e0d250e6674b6dc2aa98906922f5ccdd0800222b724f759d96174648147ca12e710e574 WHIRLPOOL 8eac57ebcc2eca69b89f98c053332380d902fc1d20dc46bf06768150f14e48b5cf77c203ebf4001766fde05ba9c80ad3bc94ce105ac9e32466c58fc48c64fdad
-DIST numpydoc-0.5.tar.gz 32051 SHA256 93f050bceb52489d92f85c346981f1962c867c01f233d3252894ceae5cb48d34 SHA512 f5ddd07103f3eadad979ddca2bfb4b1681fb783e58de80fbb2cbcb85dcdbe2340f708c94c9d494dce44ac3b1dff1b4b7bcf57231c2eb848f9468b72cec03b038 WHIRLPOOL dbb713f97c0a0a02ae06fd0d2190b2d52471a7ab1c1dcd5bbcf7df98111c97818a32c53c7857648e6c6788818f39b184de6544480382fc011e4a6a52ea43ba1d
 DIST numpydoc-0.6.0.tar.gz 32464 SHA256 1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7 WHIRLPOOL da0615ef43ad45c0d016bf940092b87c32b2ae21ea25ba695931e40a301412a56c12277ff4cead7645b75f3a4bd3f13e077ad9b60684a35da98929b3c6ca6aeb
diff --git a/dev-python/numpydoc/numpydoc-0.4-r1.ebuild b/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
deleted file mode 100644
index 8ffe38c045f2..000000000000
--- a/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	chmod -R a+r *.egg-info || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests are written only for py2m pypy
-	if ! python_is_python3; then
-		nosetests || die "Testing failed with ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/numpydoc/numpydoc-0.5.ebuild b/dev-python/numpydoc/numpydoc-0.5.ebuild
deleted file mode 100644
index 10d27bcd2513..000000000000
--- a/dev-python/numpydoc/numpydoc-0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	chmod -R a+r *.egg-info || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index fa235b6df337..7219f557cc7a 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,3 +1,4 @@
 DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
 DIST oauth2client-2.0.1.tar.gz 153127 SHA256 fa0357fca4ce431073ead236256347aafe3d368c16c5edaeba7f826b1b1d5fb6 SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183 WHIRLPOOL bef0f7394cbeade328f74288bd602973a7828915ff616c7331d6c1910be02bc74a8e11062bd0602a2c4f1681d7d8c6558aecd695df3ef711f74ba81fad0b1ab3
 DIST oauth2client-2.2.0.tar.gz 167484 SHA256 07b44748059d6390ce2247195b2ae2117773617614f76ec9375e56fd43295f06 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6 WHIRLPOOL 6cb1b3a6dbc4d3e0fca8d72417810873f11428afb4d4f52b08f7028c984bd330acf043ca10c339453c6f4e38c1f179c2e9126a9f6cb419323a53cbc769ebbe8f
+DIST oauth2client-4.0.0.tar.gz 183288 SHA256 7230f52f7f1d4566a3f9c3aeb5ffe2ed80302843ce5605853bee1f08098ede46 SHA512 b59805702c7acb306801a04a92b7f700c0f58d5937b4b27a497018d313922512b5ec3f1711bacf13bc7e01c4f006eda5344a9055f981ba34e116c34c56c5dfec WHIRLPOOL 409ff71754038acb3a67841edfb7dd33865c0db9e55717ea2255eab506d298603034cc5347c6219f8978b5a2ec068a5ccf4e1f0ba53533e9810794016e4822b1
diff --git a/dev-python/oauth2client/oauth2client-4.0.0.ebuild b/dev-python/oauth2client/oauth2client-4.0.0.ebuild
new file mode 100644
index 000000000000..9e22559bd8a2
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-4.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed -i \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index a0b681c8904f..eb59572e68c3 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,4 +1,2 @@
 DIST paramiko-1.16.0.tar.gz 1335094 SHA256 3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892 SHA512 d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962 WHIRLPOOL 10053403a526e11d2e300cfccb8bb95889ee4424621853f8b20f42257c71fdb01aba6358c3fd9dd3ede2aa8d7291affac56582abbb3d9888dc1c217d3757c3f3
-DIST paramiko-2.0.2.tar.gz 1190464 SHA256 411bf90fa22b078a923ff19ef9772c1115a0953702db93549a2848acefd141dc SHA512 6e96a67fb496990967641c53a616f0d774716f1969b0e4f290815776d61071804d8c606c3cefadc010a95ce926ab05bad201233210f9bed772dcee377b336bb6 WHIRLPOOL 379d53534d098a0b0aa30d9ec41e9b6cba9789db0db111be4cf45b1dc3c538dc17618eed173602538bf8365f8fbe730cdc03c38488badc6c580e45f2faf06d14
-DIST paramiko-2.1.1.tar.gz 1196454 SHA256 d51dada7ad0736c116f8bfe3263627925947e4a50e61436a83d58bfe7055b575 SHA512 8352688eff78aa6e15ee12572851462aea538d2d00cbc392d5cd7e4eda9536e95d3e3dfca6c85b5e5ea18262e9796a323224da4ced0474692996d8b45558f128 WHIRLPOOL cb49ccdadf4e359963e378970c1a7912cf567862b442de905c1e396c5f374748a38ce6ec8f9353528448c3f750059023a61dc8a096cb906670fd200c7adb346c
 DIST paramiko-2.1.2.tar.gz 1196746 SHA256 5fae49bed35e2e3d45c4f7b0db2d38b9ca626312d91119b3991d0ecf8125e310 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466 WHIRLPOOL 39014f4ab316ccf13ce336a594befd00c68dd3eb371f9e29592ec32ee1afcc91ae9307b2c9ae4227569fbc5d5d2c639532cce4552780d4e35743cd5c834a28a3
diff --git a/dev-python/paramiko/paramiko-2.0.2.ebuild b/dev-python/paramiko/paramiko-2.0.2.ebuild
deleted file mode 100644
index 61ce0c1a47c0..000000000000
--- a/dev-python/paramiko/paramiko-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.1.1.ebuild b/dev-python/paramiko/paramiko-2.1.1.ebuild
deleted file mode 100644
index 61ce0c1a47c0..000000000000
--- a/dev-python/paramiko/paramiko-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 756a13df8305..c28d0890a2ff 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,6 +1,4 @@
 DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a
 DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b
 DIST pep8-1.5.7.tar.gz 67302 SHA256 15b42131b25f376165d195fe4e17b0a28311182aaf9330d5eb575bbeda5a6989 SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb WHIRLPOOL 09621e17fec73de00ab4840365898084651bab4cbcf982a1393eba5e0bb2d04c0374c5dd69bf6915b6542b4ce6ac13a614395811387badf6384f266d0b61fec3
-DIST pep8-1.6.1.tar.gz 73103 SHA256 573677cb85ff089244b0f99af955f76c2e37456632610b6deda6167139ce155a SHA512 7a9d83cfe7b61b2ef598c74a465b81971ad1d0be3a708410e431d8475fc507204979857c10dbf4332701aac0d28244f19dc9c400ca85161acdd61d8084158ef8 WHIRLPOOL 0a032be9cdea4f45c86255dddbb06e1629e148e8b15e6a83d8abc7ed06f52d6c184f2953367dca5b94978e2351b3873c6cf3bc02c811aa9f8ce50964b31306c5
-DIST pep8-1.6.2.tar.gz 74534 SHA256 b8b7e35630b5539e26a197dfc6005be9e1e9a135496b377723a8ebc01b9bcbff SHA512 f046a1e3ed68a7c409ad6c501a54ed14188de670f0e0d873d2d7960e45fec0c4e2c27067877854ecbb20f3690f9d2ca1fa4bc1cc52b22e1f71bd0aec4ddb6fc9 WHIRLPOOL cf482b333da7a7c936277e2fdab057b6e9b30ef7597dde0f4e49abc3b18727584814779d15216977371a8e72b593395083bda8728600d55fab6ce3b43ce777ee
 DIST pep8-1.7.0.tar.gz 79704 SHA256 a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a WHIRLPOOL 6ff0baa6c1aec5db641cff6cefdb2310f31af482c92e97d27edd3b9ae85d8f255c1283cd9261b9db74d5d5d4c73c72180e55edb3303f2f018889bab7ea9b00a3
diff --git a/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch b/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
deleted file mode 100644
index f3557728a733..000000000000
--- a/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 435d1cbf995a659a82d1d4b42d25e3459556ef21
-Author: Ian Lee <IanLee1521@gmail.com>
-Date:   Tue Mar 17 21:52:23 2015 -0700
-
-    Reverted fix for #368 which had unintended repurcussions in flake8 and other places.
-    
-    This fix reverts to the parsing of user config (~/.config/pep8), then local directory
-    config files, and finally overrides with cli options as was the behavior back in 1.5.7
-
-diff --git a/CHANGES.txt b/CHANGES.txt
-index 85eb043..5499abd 100644
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -5,6 +5,12 @@ Changelog
- 1.6.x (unreleased)
- ------------------
- 
-+Changes:
-+
-+* Reverted the fix in #368, "options passed on command line are only ones
-+  accepted" feature. This has many unintended consequences in pep8 and flake8
-+  and needs to be reworked when I have more time.
-+
- 1.6.2 (2015-02-15)
- ------------------
- 
-diff --git a/pep8.py b/pep8.py
-index 9f40381..4d993da 100755
---- a/pep8.py
-+++ b/pep8.py
-@@ -1984,24 +1984,24 @@ def read_config(options, args, arglist, parser):
- 
-     local_dir = os.curdir
- 
-+    if USER_CONFIG and os.path.isfile(USER_CONFIG):
-+        if options.verbose:
-+            print('user configuration: %s' % USER_CONFIG)
-+        config.read(USER_CONFIG)
-+
-+    parent = tail = args and os.path.abspath(os.path.commonprefix(args))
-+    while tail:
-+        if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
-+            local_dir = parent
-+            if options.verbose:
-+                print('local configuration: in %s' % parent)
-+            break
-+        (parent, tail) = os.path.split(parent)
-+
-     if cli_conf and os.path.isfile(cli_conf):
-         if options.verbose:
-             print('cli configuration: %s' % cli_conf)
-         config.read(cli_conf)
--    else:
--        if USER_CONFIG and os.path.isfile(USER_CONFIG):
--            if options.verbose:
--                print('user configuration: %s' % USER_CONFIG)
--            config.read(USER_CONFIG)
--
--        parent = tail = args and os.path.abspath(os.path.commonprefix(args))
--        while tail:
--            if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
--                local_dir = parent
--                if options.verbose:
--                    print('local configuration: in %s' % parent)
--                break
--            (parent, tail) = os.path.split(parent)
- 
-     pep8_section = parser.prog
-     if config.has_section(pep8_section):
diff --git a/dev-python/pep8/pep8-1.6.1.ebuild b/dev-python/pep8/pep8-1.6.1.ebuild
deleted file mode 100644
index 7c2c499d7e57..000000000000
--- a/dev-python/pep8/pep8-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.6.2-r1.ebuild b/dev-python/pep8/pep8-1.6.2-r1.ebuild
deleted file mode 100644
index 671865f14414..000000000000
--- a/dev-python/pep8/pep8-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-restore-flake8-compatibility.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.6.2.ebuild b/dev-python/pep8/pep8-1.6.2.ebuild
deleted file mode 100644
index 7d30c7438789..000000000000
--- a/dev-python/pep8/pep8-1.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 537a179c80dd..0d83944fa760 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1 @@
-DIST priority-1.2.0.tar.gz 12064 SHA256 70468e7f43c4bb19cd966d63f78367d8c5af68828611aa3f3e5d77b8948cd2d4 SHA512 00cac802a7d4a6960e71d6d5552c2649becb07e9bd124421b8a391f3681ecdfcc4928725cfffe1011143789b75b8660bd178dbef1f7ebfadd25057d9d7f22dee WHIRLPOOL b1a2d5d9f64e22f341d6ee8f0e0dc43e4fdd2cebb0330ff186be12dbf3e676a20e17b1e27dae1eb7679e6debffaed92eeb2cc88f45fc8180bbc13cca8df2b7e4
-DIST priority-1.2.1.tar.gz 12558 SHA256 21e3b5a3b64cda106556023c9ac1223a026a45252536dd33b992a35e557280a4 SHA512 f396ffddcb574fc9e672f2211c39aa2643ab66953c2c3fb2d1b21b1714d48fcca2a2b122c703d6a684ebdc829253c6b42e4cfb935b1caa43e18d1c6d5b7912cb WHIRLPOOL a4d1032fde4cf41d4709eda56a8b18a5fb896e0ce25d392d0fa7613078223c294e4f181a0a1aa59acaa8e68cb50045d305ccd81411c7c9ef2e3d114d6c4e9795
-DIST priority-1.2.2.tar.gz 12779 SHA256 6cd04ba9d2ce1a6a25ceb5f52674c3f400cf21ff948fcfcf76afd6c8a9b19c07 SHA512 72b77fab8dd4fc61b11ea8c4e1137a53653f8d3c0e30a00eea1443d2fc5e43a5b66f18d7b62db051cb70075671860ccf044af1e03578fb96f9427e20379f3b22 WHIRLPOOL f6f622cfc6292d6b3043d61447d39cc3bff575ab4679d5d21ee31ee80e473d26c8017c829fa5eef1f63fb83a4f4f893505fba06456503e0721e960c1b2fcbd8e
 DIST priority-1.3.0.tar.gz 13827 SHA256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a WHIRLPOOL 45fe643b70a4c3cb9e3600e73475384a5b339acbb0a801be8c0e6c190bc2e3894443b28c3b691b3c555250175d6d313808c6bf7a0fed3b586c9fe7beb3b4a843
diff --git a/dev-python/priority/priority-1.2.0.ebuild b/dev-python/priority/priority-1.2.0.ebuild
deleted file mode 100644
index 456e0aabd918..000000000000
--- a/dev-python/priority/priority-1.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
-}
diff --git a/dev-python/priority/priority-1.2.1.ebuild b/dev-python/priority/priority-1.2.1.ebuild
deleted file mode 100644
index 456e0aabd918..000000000000
--- a/dev-python/priority/priority-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
-}
diff --git a/dev-python/priority/priority-1.2.2.ebuild b/dev-python/priority/priority-1.2.2.ebuild
deleted file mode 100644
index 29d343dc3bff..000000000000
--- a/dev-python/priority/priority-1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
-}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index af8e0f0981f0..8d27a35812ab 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,2 @@
 DIST prompt_toolkit-1.0.0.tar.gz 212138 SHA256 5108ed9e6e40d28cb1dc90ba563987859231289700d0def999007b08f4f74ea4 SHA512 84908871df84d82b0fd0e31c1bef63b3dde38d8e3c1459d3d5466cfda68ef48477eba5a2d4c5af831e7a3fa42ab57c56f771f8050b53223638683cee27281647 WHIRLPOOL a141f2ed1bc57ef9b663877094c9fe3e4a751a59f72c327da479872bfdd48b7b70ba78f3d4be2c397acb699d2adf272a8df5c8db7b3999b2711dd1b62d4a3d0d
-DIST prompt_toolkit-1.0.13.tar.gz 240895 SHA256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 SHA512 9018133a7cf20c40b85d78a1622ad63a12b32994d054c7b8a593502929b6f01138d407e25f2de549a44a5d5091074e440960bc230c357806ef1507f19e15b1dd WHIRLPOOL 9121b44db7300d489821555f0bef2effb472e059b2980c0705f4006fa8d112114832e59fb7ef6f1ff6e9b442c39a7b03f05a4de908b61e52e94df4f0166f438b
 DIST prompt_toolkit-1.0.14.tar.gz 241612 SHA256 cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f SHA512 909bf50bf0095a8cc37581fc7384f9035eb9d6fd0d16a914e8912693476262cfe0b0c78643ba1c629bd907c861981a9740155927148fcff554446ebb4fd80959 WHIRLPOOL 5967bab046f70bfb74ee8e548fb3a7c5cdfeb328498176db28cf3cea5c47233697e193d4e47f0ae688718c228867b4a9b8a1c7227ce0a94b3e9b30441ec44961
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.13.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.13.ebuild
deleted file mode 100644
index aee90f07c2ee..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 47735d8c4db9..019245d428a6 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,3 +1,2 @@
 DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f
-DIST py-1.4.31.tar.gz 192212 SHA256 a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114 SHA512 fd0f4f509d81beb8e5cdb5a8d5d7d40d8a74737c017c915b0630ce740868c32fbf1af4a01dec2ae998e5a9516578e8404ad2b8d966606919767ae25f27eb0b0d WHIRLPOOL 2c1227fc8b3fd044eeea398393a79868b12ef9ab7291522f4c6c08f70d4d725c305a407c3a6893920c405fdf1bc29d97b9ac2a182abdf3a4cde1f6001cd1c38c
 DIST py-1.4.32.tar.gz 598861 SHA256 c4b89fd1ff1162375115608d01f77c38cca1d0f28f37fd718005e19b28be41a7 SHA512 3596d792d8c242c99088001dee1f993f78b1940d8062cb8b81ab3734467a89d30fec790db0baef7fdec23f012b2ec9f70989f09a63cc915e79fb23b1ace47770 WHIRLPOOL ac03859d54effc1642d210f00f30ae26f6d26e0669f6846c219aa56a0079f97ee1df3a2bf7515e36abc215f6f8e59db7caa44e380d1b114ba8686879e21f3891
diff --git a/dev-python/py/py-1.4.31.ebuild b/dev-python/py/py-1.4.31.ebuild
deleted file mode 100644
index 82192cf361bc..000000000000
--- a/dev-python/py/py-1.4.31.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 22e705b56370..d23d257be6bd 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,4 +1,2 @@
 DIST pyasn1-modules-0.0.5.tar.gz 38710 SHA256 be65f00ed28e30756f1ef39377cb382480a2368699179d646a84d79fe9349941 SHA512 b8fa41ed28087097502e8362022d819fe6914511c09f60f64f173c5674684fa8c45de23ce718700001d9f2d9b11adc17657d7cfd4cb24ea740b8d14eba8d8161 WHIRLPOOL c0df005909ffa4320f0ff7c580410ff2468cdd4002dfa5383e561c9c65721c0a72169e10c72fdc225b308d8fd1d5691dc519b6ee811c167ddc466ba1657e92c8
-DIST pyasn1-modules-0.0.6.tar.gz 38940 SHA256 1f41d3f3da43e9a769e23649724368aa0b88afcfd1fe6e9f210d31d13322fc15 SHA512 1ae7d641647d239737daa20f8519f92b0727381bf44de2b65130a7626233b1b430cd8fad04fdc856387d7ba9ad226960a87f6f58d64d4ba09c3e6316130c5855 WHIRLPOOL 4bc2776ca2bd81ba3b2f5337f7736084ee17c5fa13532a4be2dbee0cf6fe3f501a1d63fb1b3ac397a0c507e862795bb8819b15621c38ee0575cf3de5ee257afe
-DIST pyasn1-modules-0.0.7.tar.gz 38605 SHA256 794dbcef4b7124b8271f12eb7eea0d37b466012f11ce023f91e2e2082df11c7e SHA512 15e3f456b1fbb74a08cffc6d5f9910617b7fa67fbcb5028ac8da8c1592c4cd192d4f726b13d6f0b82f01a55511fbc7a9478d446e57241307517d9213a65f393a WHIRLPOOL 6bc2389c9e734cc310c28276e56309c82f4def9cb2582d5222a3d6004b2f38a9279adf35f5200137dd2f844631123963c907fcf0279286a9f99c541277bb9ecb
 DIST pyasn1-modules-0.0.8.tar.gz 38776 SHA256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 SHA512 6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78 WHIRLPOOL 45f3c2ad6e3320f5d7d1f3bef6f0168f2d85b3093f33438aaacc8251d6457d88c2db659d0912a76417196f5ed431c427fc9a47a8a6af5c490d97f931515d2884
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.6.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.6.ebuild
deleted file mode 100644
index 448f99490cf3..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	for test in test/*.sh; do
-		PATH="${S}/tools:${PATH}" \
-			echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}/tools
-	doins tools/* || die "doins failed"
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.7.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.7.ebuild
deleted file mode 100644
index 448f99490cf3..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	for test in test/*.sh; do
-		PATH="${S}/tools:${PATH}" \
-			echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}/tools
-	doins tools/* || die "doins failed"
-}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index db345db4b74f..df0ecb4c9fd6 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,4 +1,2 @@
-DIST pyasn1-0.1.7.tar.gz 68120 SHA256 e4f81d53c533f6bd9526b047f047f7b101c24ab17339c1a7ad8f98b25c101eab SHA512 af2ac05fb7e18b25bd125f92bd7c8389a00c18018c1ff48d94c196f5ab41b09c8991d2e326d492cfaed755b06cd4c75d88719b4a390bdab6d84fe3c8791620af WHIRLPOOL 902b80616cecbf3549417c95ec09c060c6a038f95bd71ce2f9a5c0cd1e4cfd4e9157252abedec3002588eaba5a3cecd7100138c952a5e8f8b7e245b4f82d5c7c
 DIST pyasn1-0.1.8.tar.gz 75676 SHA256 5d33be7ca0ec5997d76d29ea4c33b65c00c0231407fff975199d7f40530b8347 SHA512 0a0b9b8018ae80a0e0d84ea3a4f217951bf42dce909a354c97890d4b4fc4f49b19d9d0757103ac9002c17c6c622c8e8d66e1f8242b8545a7da455ef3583acdfa WHIRLPOOL db46e06ef9a6b5858c07f1c154657f998b509c457395b4f2e6286ea90e1b16346e24d92a8d666b5db4216e35129f2d6be13c2fc11aae2d9936163bff3b1400eb
-DIST pyasn1-0.1.9.tar.gz 75947 SHA256 853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f SHA512 c72bdba84c4cc860a1790d752861dc9de30dabb61e5146a551597b4a97e64797dbd6e575e61cb9a8b23ffc58bced143b0ed55a7c98d0a85834ccd60b17856df5 WHIRLPOOL 2d47a9cf1a04a9f07a053926bd4d317ae71f52e7df88b9be53ff343d1e82770cb5c6709e6fa154e9cf0bb05e47c6c24f6736899bbf41c39a01f6d0211cfb98a5
 DIST pyasn1-0.2.3.tar.gz 100099 SHA256 66c70011074ed6f5a74591591a9f0bed4bc2c2a45baef60f8dcc89ab5da11b9d SHA512 c55b95c1995f2fc36ec28f35837ca456a2fac06e90edc6491a3335ae949e4eacbbeb14f6289a17e994b49d4dc60870bba3e79344c44496d5547c38ab1ef183ab WHIRLPOOL d74142002096d49914e8b15a425764a08c02a43326b9ca1511f4e316fd025c0ce9333c748e010794fe788416b38aa7a1e3460c346524200ba4bd3836297d405c
diff --git a/dev-python/pyasn1/pyasn1-0.1.7.ebuild b/dev-python/pyasn1/pyasn1-0.1.7.ebuild
deleted file mode 100644
index 4a4f2b4a8508..000000000000
--- a/dev-python/pyasn1/pyasn1-0.1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/pyasn1-tutorial.html )
-	use doc && HTML_DOCS=( doc/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pyasn1/pyasn1-0.1.9.ebuild b/dev-python/pyasn1/pyasn1-0.1.9.ebuild
deleted file mode 100644
index 5e7f374ad222..000000000000
--- a/dev-python/pyasn1/pyasn1-0.1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/pyasn1-tutorial.html )
-	use doc && HTML_DOCS=( doc/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 6f6932018b21..a49e511554fa 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,2 @@
 DIST pycparser-2.14.tar.gz 223295 SHA256 7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73 SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6 WHIRLPOOL 4a541ce696298a355d4e3325a10dffd47bd26756b0164da82b70090310edfacf0428ed9e26de7be7e3d4c2c952ee664262a212562852fe29f909ab0631bfd79f
-DIST pycparser-2.16.tar.gz 230060 SHA256 108f9ff23869ae2f8b38e481e7b4b4d4de1e32be968f29bbe303d629c34a6260 SHA512 854c93b8c75aeecf7b3df61ee181693e31e7cf59d6a695fd1b32ff8baf5916bc38f9574af6d0db888764eb756f1dc06555e83c8d990e1dc0ddad2b03db23ecab WHIRLPOOL 1fa47f0526ef892356fc7eaab6541825ce9ddb34033574926680c0983b070c8429ff9269d28e98d0bd47bd1964624fb9662b2b3433aaeca8ee172fe091d24796
 DIST pycparser-2.17.tar.gz 231163 SHA256 0aac31e917c24cb3357f5a4d5566f2cc91a19ca41862f6c3c22dc60a629673b6 SHA512 c9caaa8d256748e0623d077b11931abb38d19367136c70a835f7587e1f7ceb64f3acb7a983dcb68bedd2cf187517762a5753844e8ed58d1d9ed6f364c55839b4 WHIRLPOOL 4d3585a8c95add8b607bb79b89f8c00d16ab9361cfc72b65a5112b756b8d965cdc9c19af36ab7a73647425788e9121eafd6b0da01c2ca8de6d2b00ed5d097bba
diff --git a/dev-python/pycparser/pycparser-2.16-r1.ebuild b/dev-python/pycparser/pycparser-2.16-r1.ebuild
deleted file mode 100644
index c5ee9a75ad08..000000000000
--- a/dev-python/pycparser/pycparser-2.16-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-pkg_pretend() {
-	if has_version "=dev-python/pycparser-2.16"; then
-		eerror "You have a broken version of dev-python/pycparser installed."
-		eerror "Please remove the broken version before continuing."
-		eerror "eg. emerge --unmerge =dev-python/pycparser-2.16"
-		die "Broken dev-python/pycparser"
-	fi
-}
-
-python_prepare_all() {
-	# Bad permissions in tarball
-	chmod -R go+rX "${S}" || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
deleted file mode 100644
index 1facacf5da73..000000000000
--- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto"
-SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
-
-LICENSE="PSF-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="doc +gmp test"
-
-RDEPEND="gmp? ( dev-libs/gmp:0= )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' python2_7)
-		)"
-
-REQUIRED_USE="test? ( gmp )"
-
-python_prepare_all() {
-	local PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
-	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
-	# https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
-	sed \
-		-e "/keyparts =/s/'ssh-rsa'/b('ssh-rsa')/" \
-		-e "s/keystring = ''.join/keystring = b('').join/" \
-		-e "s/return 'ssh-rsa '/return b('ssh-rsa ')/" \
-		-i lib/Crypto/PublicKey/RSA.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# the configure does not interact with python in any way,
-	# it just sets up the C header file.
-	econf \
-		$(use_with gmp) \
-		--without-mpir
-}
-
-python_compile_all() {
-	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html || die
-		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
-	fi
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( ACKS ChangeLog README TODO )
-	use doc && local HTML_DOCS=( Doc/apidoc/. Doc/index.html )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycrypto/pycrypto-2.6.1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
deleted file mode 100644
index 507af963d160..000000000000
--- a/dev-python/pycrypto/pycrypto-2.6.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto"
-SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
-
-LICENSE="PSF-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="doc +gmp"
-
-RDEPEND="gmp? ( dev-libs/gmp:0= )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils
-		>=dev-python/epydoc-3 )"
-
-python_configure_all() {
-	# the configure does not interact with python in any way,
-	# it just sets up the C header file.
-	econf \
-		$(use_with gmp) \
-		--without-mpir
-}
-
-python_compile_all() {
-	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html
-		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
-	fi
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( ACKS ChangeLog README TODO )
-	use doc && local HTML_DOCS=( Doc/apidoc/. Doc/index.html )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 6f52b4468f5b..44b0eebb2b86 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,2 +1 @@
-DIST pyFltk-1.3.0.tar.gz 915600 SHA256 c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61 WHIRLPOOL 62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
 DIST pyFltk-1.3.3.tar.gz 946763 SHA256 246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f WHIRLPOOL 8d94349db36cd78eeee722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1
diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
deleted file mode 100644
index f29b7b3c9221..000000000000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
+++ /dev/null
@@ -1,74 +0,0 @@
- python/fltk_wrap.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
-index 9c16f59..ad42e89 100644
---- a/python/fltk_wrap.cpp
-+++ b/python/fltk_wrap.cpp
-@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
- 
-   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
-     const char* result = 0;
--    result = fl_input(label, deflt);
-+    result = fl_input("%s", deflt, label);
-     return result;
-   };
- 
-   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
-     const char* result = 0;
--    result = fl_password(label, deflt);
-+    result = fl_password("%s", deflt, label);
-     return result;
-   };
- 
-@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
- 
-   void fl_mt_message(const char* text) {
-     Py_BEGIN_ALLOW_THREADS;
--    fl_message(text);
-+    fl_message("%s", text);
-     Py_END_ALLOW_THREADS;
-   };
- 
-   void fl_mt_alert(const char* text) {
-     Py_BEGIN_ALLOW_THREADS;
--    fl_alert(text);
-+    fl_alert("%s", text);
-     Py_END_ALLOW_THREADS;
-   };
- 
-   int fl_mt_ask(const char* text) {
-     int status = 0;
-     Py_BEGIN_ALLOW_THREADS;
--    status = fl_ask(text);
-+    status = fl_ask("%s", text);
-     Py_END_ALLOW_THREADS;
-     return status;
-   };
-@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
-   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char *b2) {
-     int status = 0;
-     Py_BEGIN_ALLOW_THREADS;
--    status = fl_choice(q, b0, b1, b2);
-+    status = fl_choice("%s", b0, b1, b2, q);
-     Py_END_ALLOW_THREADS;
-     return status;
-   };
-@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
-   const char *fl_mt_input(const char *label, const char *deflt = 0) {
-     const char* result = 0;
-     Py_BEGIN_ALLOW_THREADS;
--    result = fl_input(label, deflt);
-+    result = fl_input("%s", deflt, label);
-     Py_END_ALLOW_THREADS;
-     return result;
-   };
-@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
-   const char *fl_mt_password(const char *label, const char *deflt = 0) {
-     const char* result = 0;
-     Py_BEGIN_ALLOW_THREADS;
--    result = fl_password(label, deflt);
-+    result = fl_password("%s", deflt, label);
-     Py_END_ALLOW_THREADS;
-     return result;
-   };
diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
deleted file mode 100644
index 9b084616c871..000000000000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=375253
-
-http://lipyrary.blogspot.com/2011/09/python-and-linux-kernel-30-sysplatform.html
-
---- setup.py
-+++ setup.py
-@@ -76,7 +76,7 @@
-     lib_dir_list = [fltk_lib_dir]
-     lib_list = ["fltk", "kernel32", "user32", "gdi32", "winspool", "comdlg32", "Comctl32", "advapi32", "shell32", "oleaut32", "odbc32", "odbccp32", "stdc++", "msvcr71"]
-     #link_arg_list=["-Wl,--enable-runtime-pseudo-reloc", "-Wl,--enable-auto-import"]
--elif sys.platform == 'linux2':
-+elif sys.platform.startswith('linux'):
-     print "Building for Linux"
-     # ugly hack to force distutils to use g++ instead of gcc for linking
-     from distutils import sysconfig
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
deleted file mode 100644
index 4abf9a2b8f02..000000000000
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_P=pyFltk-${PV}
-
-DESCRIPTION="Python interface to Fltk library"
-HOMEPAGE="http://pyfltk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-linux-3.x-detection.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/ignore-func.patch
-	"${FILESDIR}"/fltk_wrap.patch
-	)
-
-python_prepare_all() {
-	# Disable installation of documentation and tests.
-	sed -i -e '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( fltk/docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 8f623f02bdf3..691307d35969 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,2 @@
 DIST Pygments-2.1.1.tar.gz 2114190 SHA256 2df7d9a85b56e54c7c021dc98fc877bd216ead652c10da170779c004fb59c01b SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807 WHIRLPOOL 6b1ebed4b3c456ada335be87d184bfe197f489b445c362c8f1326229e137e859388e1812290bf1d7f6ed19b780dc8487fe9744863833889d961604fb9489b381
-DIST Pygments-2.1.3.tar.gz 2116434 SHA256 88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81 SHA512 f6885abfa0033dc2b8894649c7a4626165af01e69268344f002efdfc536c776a9af86be4e76e5905bd31cb78096e1ed3c16d9dd4b29c6a97b4c9cc1bfd7a5b67 WHIRLPOOL c2315b8be55adc65f48675e58f946af6bf2118661beb0ab7ac149325a2d7f7b19aedef7b1ea6e070b5405c80c3b212cbe520ef23969bffb63bee1d7d6f589f41
 DIST Pygments-2.2.0.tar.gz 2113944 SHA256 dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 WHIRLPOOL f0562ce0b92245050657b6b8b0952bbd719ad8789434a2c87bb45594787839405bc2fcb05ed125fe1801a71739462be5be96263d27075427a4bafaa5b44e3fe7
diff --git a/dev-python/pygments/pygments-2.1.3.ebuild b/dev-python/pygments/pygments-2.1.3.ebuild
deleted file mode 100644
index a3cb534039fb..000000000000
--- a/dev-python/pygments/pygments-2.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts )"
-#		dev-texlive/texlive-latexrecommended
-# Removing / commenting out this dep. I can find no mention of it in tests other than
-# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
-# Tests pass without it
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 1843082e5971..d8c22cada6cc 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,9 +1,3 @@
-DIST pymongo-2.6.3.tar.gz 324241 SHA256 cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2 SHA512 6da3cbf035b52379c24df37b76e1eb743b12c1026116e28e4e7b6450e2674d730f9c8c2dd85f352c6ee4c9f604decaffc2dbc57fe64268bd7522d8ce155cca9e WHIRLPOOL ac36dd88c4311237ecda66a6008fa0d89d0670e331df6c49a08a1d3bc4ddcafe72e8e003009c206d3ac12afb1b14afe2d3615834a5a8df5ce30442f7b49fdbf2
 DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b3201ce0abf31593f086070e51f6 SHA512 0e78495462d670c168e716a7c34e05f6a11a203f0bf9b32c1488608343588a48cbbb76ce715411b310359de19d9cd57c75f80ac7d8195a122a760cec22e8d0c7 WHIRLPOOL 6cb7eedc530908c2fdb17b6e31561d9c860d6fd1edddb4d66288c3fe11bc199ebc58538a70508b2540b827077f62345a86729644fdf8d37c1b9934de03e77543
-DIST pymongo-2.8.1.tar.gz 399521 SHA256 300ea5762d059c07d1bb2578f35bd0e55bc31753951e2de3d6fe2ed54438e374 SHA512 8d02829eb8683572ffe8c1be5ee50a4c778e1a0b938820859be215b583e719d079183b1a26bc074fad7e31e8944756b82b146657ad528123514b59c725f6d7aa WHIRLPOOL b0c8c373771d3a4525ddf30db5903a6b1241aa1e160e688c215bef21395d598faa65f12e57ea8fe0f16d1c0eaa0abad02ebf3e0b9df2acb8e1c8e6ff9c20a214
 DIST pymongo-2.9.3.tar.gz 433339 SHA256 1a3a75e4998a6b69d9f94c1dbac13116aee90a3f26d02f02fc0289f9e8b332c8 SHA512 7b0c46ef1ca27e8c4d99d00c764aa1ce7775503d5210513ca848215fe0be847871c6d62d14f365474606b4abfdb7d1967d3f393e545cdca8929f7fa6a497c32f WHIRLPOOL 84f6041211022326522f16e02313afbd4763f756a89d12e00714718113926ba32d3b384a22b474fe571a30b23ef49c9c1bf5f9faceb9f3d7293fd795475b5ffe
-DIST pymongo-3.0.3.tar.gz 419692 SHA256 3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf SHA512 7a20fdcae5b3f852bded19c95b36ef6a8141bce0179440a2c5966cbb9f18f3985b7b6b4584c5253c34d0f846d809d72ec0ae076c88472a3de6f090466e9132b4 WHIRLPOOL ae610909b610c7d116dd3aa7c04ab9ce357b25208b07c025924c53bb36183a6d344ecff214def6a01b929dc50d698464c8dd33b6eafd2d88d6666d8534858a38
-DIST pymongo-3.1.1.tar.gz 462020 SHA256 98f550d27481cb841c0f5de023df644e7a3beb235b8a22a091e6dafd39c6a82a SHA512 8b11bff856736e997b50f22aec5ecb350c4407569ea4f5cdfdcdbf81250b2ddb4124d4ce1fc0bcf2392aae19fdfda5c15b2504c10141159218f257dc27dc77e5 WHIRLPOOL 03be4b4b5ff438f7a6a85a102964a1e23899521744d2b8d74b074d1a87defb429aa592b4335ed8eb8fe750340a59fc61f10e79286a096afa51c0d32dd8c73e64
-DIST pymongo-3.2.2.tar.gz 504184 SHA256 f2018165823b341d83d398165d1c625e5db5cc779e7c44c107034407808463b6 SHA512 f1e8afd41cf8b1fafe777365e33baedfe7626e3ff311428bf59e2bf0a247aa03ced0d32f37bfb349ff2e54aa22a06f763d04787087add7222e0d8f68c5f73eae WHIRLPOOL a3f6b442316ca2fb6db54eb640f06b7d8fc3f4f8c1bd22cac167c58737c2daaadd055581a6372a443e91fff0829a6bb013a2fe602c92332d767a60257d11629b
-DIST pymongo-3.3.0.tar.gz 494736 SHA256 3d45302fc2622fabf34356ba274c69df41285bac71bbd229f1587283b851b91e SHA512 c58189acf01d4fa6f455ee7773d281223a6a537ddb8229e2f18137c1915003da5420cd9eb82bed2b84e1cb16b9a2e831b673b4017987d6a4b154df508cac6738 WHIRLPOOL d58a9c52d579817316ff99a1c2efe29941f2f8f480f062160876b619a73f8741060164d843d4877796ac020a251b6e189509d313eab947831107549ad3643129
 DIST pymongo-3.4.0.tar.gz 583303 SHA256 d359349c6c9ff9f482805f89e66e476846317dc7b1eea979d7da9c0857ee2721 SHA512 c59dcc08803f23134aa4a86605fab0f5c59b829325b632fc1e0149f20018a544b3d65f3c1fda6066248cd258715339b1771ca8d40c38be02c301f5b6421abd1b WHIRLPOOL c57dfa17ed0940d2ef956c2ae3dca91375b9f7fcc4e78ba3d809d838285f433141bbf8cd0a46498f1c8332e9731f6f06a40c89ba69568abe51c65c59ef03ac11
diff --git a/dev-python/pymongo/metadata.xml b/dev-python/pymongo/metadata.xml
index 0d71a4029e8e..64db28e6758f 100644
--- a/dev-python/pymongo/metadata.xml
+++ b/dev-python/pymongo/metadata.xml
@@ -21,9 +21,6 @@
 	<longdescription lang="en">PyMongo is a Python distribution containing tools 
 	for working with MongoDB, and is the recommended way to work 
 	with MongoDB from Python.</longdescription>
-	<use>
-		<flag name="mod_wsgi">Disable the C extension to work with mod_wsgi.</flag>
-	</use>
 	<upstream>
 		<remote-id type="pypi">pymongo</remote-id>
 		<remote-id type="github">mongodb/mongo-python-driver</remote-id>
diff --git a/dev-python/pymongo/pymongo-2.6.3.ebuild b/dev-python/pymongo/pymongo-2.6.3.ebuild
deleted file mode 100644
index 83cacc17fc14..000000000000
--- a/dev-python/pymongo/pymongo-2.6.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc kerberos mod_wsgi test"
-
-RDEPEND="dev-db/mongodb"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install() {
-	# Maintainer note:
-	# In order to work with mod_wsgi, we need to disable the C extension.
-	# See [1] for more information.
-	# [1] http://api.mongodb.org/python/current/faq.html#does-pymongo-work-with-mod-wsgi
-	distutils-r1_python_install $(use mod_wsgi && echo --no_ext)
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-2.8.1.ebuild b/dev-python/pymongo/pymongo-2.8.1.ebuild
deleted file mode 100644
index 5052970c631e..000000000000
--- a/dev-python/pymongo/pymongo-2.8.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc kerberos test"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.0.3.ebuild b/dev-python/pymongo/pymongo-3.0.3.ebuild
deleted file mode 100644
index 5052970c631e..000000000000
--- a/dev-python/pymongo/pymongo-3.0.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc kerberos test"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.1.1.ebuild b/dev-python/pymongo/pymongo-3.1.1.ebuild
deleted file mode 100644
index 5052970c631e..000000000000
--- a/dev-python/pymongo/pymongo-3.1.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc kerberos test"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.2.2.ebuild b/dev-python/pymongo/pymongo-3.2.2.ebuild
deleted file mode 100644
index 34dcb88ed5f9..000000000000
--- a/dev-python/pymongo/pymongo-3.2.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc kerberos test"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.3.0.ebuild b/dev-python/pymongo/pymongo-3.3.0.ebuild
deleted file mode 100644
index 34dcb88ed5f9..000000000000
--- a/dev-python/pymongo/pymongo-3.3.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc kerberos test"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 7269b15ce1be..2ac2a07e2713 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,2 +1 @@
-DIST PyOpenGL-3.0.2.tar.gz 891943 SHA256 9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03 SHA512 e5663682eee5aa7276590ae7547d8345141e2e8e34ddfcbb3867c10a91e9959ebe8ec82606e257826ba6dd21d731ad76f38134849f095a01760d007d752fe9a9 WHIRLPOOL 9638e25ae0c8e99f0adfe99eb99e6d321c0b38f6c1b6a9efb46d675707ceb547aa596878dbc99d114f53e80b80063bcd12fbeb58fb5f6296c3371c06a333f5e6
 DIST PyOpenGL-3.1.0.tar.gz 1172688 SHA256 9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb WHIRLPOOL 4e7a37a6ac07b4fa7b5a28a280a5b25a2dcb4c83bf27c6e7615c6d8ce60178cbb069eaa502b690897daae79961d47558985fd0e981117c623640e49b72f4a04f
diff --git a/dev-python/pyopengl/pyopengl-3.0.2-r1.ebuild b/dev-python/pyopengl/pyopengl-3.0.2-r1.ebuild
deleted file mode 100644
index 62367d7c95b8..000000000000
--- a/dev-python/pyopengl/pyopengl-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index a30cf7eb0246..85cdd173da47 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,2 @@
 DIST pyOpenSSL-0.15.1.tar.gz 149887 SHA256 f0a26070d6db0881de8bcc7846934b7c3c930d8f9c79d45883ee48984bc0d672 SHA512 bd204f40c9583a8580cff28b061f02ea772fdda3965dab6ac9e3f8c3b98792bea87b6de76494f7ce81e1ddcc76019432a9ffa3bcd55c5adb063bb639efe62e51 WHIRLPOOL 34badbf11b49cb65019cb55da7c6d6a539971392741d14ea1408c56dc0564d52ffeb947d86549fed17762474d863d59a406cde86daa75a329bd5b6411a77702b
-DIST pyOpenSSL-16.1.0.tar.gz 166917 SHA256 88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f SHA512 276c81d01e635445e9fdbb350e3ce040459be71d6ec2ae9b31e6ab28fee1e98157fa5b9f31674720212f2a3c42746c78f7620387452bc346482587f2d1e64b92 WHIRLPOOL 61eea8799028cfeee4719c549cee9eec625f8ab100d25863fc37febd8401ebb25058a9c8eede54375490e4d0facfd952f74bf11378da5c1a64d4f633c3589274
 DIST pyOpenSSL-16.2.0.tar.gz 167305 SHA256 7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e SHA512 c1b068137a492564fe958603712d401b7ee0def94c01a28be55f5c89e07c25684ecb0f465f3c56f35924bde038894f2914ac49539144845fb586d12b80307078 WHIRLPOOL 60f2fe38ba773ed52bcfe88da57bd78f2114d7018a6184ec1c0fa2a8ae6dab4cf2495cd2aa75d7a5b2beee49477dbb6b4256034cec83752db0a3c7e5f7c4debb
diff --git a/dev-python/pyopenssl/pyopenssl-16.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.1.0.ebuild
deleted file mode 100644
index aa4d2732d0ed..000000000000
--- a/dev-python/pyopenssl/pyopenssl-16.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.python.org/pypi/pyOpenSSL
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc examples"
-RESTRICT="test" # currently pretty broken
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	tox
-	# https://bugs.launchpad.net/pyopenssl/+bug/1237953
-	rm -rf tmp* *.key *.pem || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index b539ce2c2591..f6835bd7fc20 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,5 +1,3 @@
-DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4
 DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f
 DIST pyparsing-2.1.10.tar.gz 1230829 SHA256 811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 SHA512 21af73d6f479d52746f269c8fbaf90c1107a8aec756d30af8c7c4e6a2ff0ea9659cc07816b7ea19286bc12d43497f5e8e63351453bf18daf6a1cb380a195532e WHIRLPOOL 1ffbad12d00b99a260cd77c61503aa1800f97028be7c40e67f582c1b497ed1872e51d33887e278cd5203ec379d27886edd9455d1d8f7bef9d1b2d7df38185cc4
-DIST pyparsing-2.1.8.tar.gz 1222883 SHA256 03a4869b9f3493807ee1f1cb405e6d576a1a2ca4d81a982677c0c1ad6177c56b SHA512 0fb98d3704f9725926b20d72f770a6188a1be6f9856c371afd25d496519b794ba0026e4f9dbeeed6e5188edb99134d8909b595fca5536b1914c5e5832ebabdb2 WHIRLPOOL aba4e55c0312342a9d8525bdecea70bf322b52a52097b25c1ea412e4270145945b05dd72cbe0b5252447d75be2e0a2afdc5a99e3864845c5bface6ae3c9cd743
 DIST pyparsing-2.2.0.tar.gz 1232522 SHA256 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008 WHIRLPOOL dde3e3ec016671f76976f4b585a027070b3087b46a336363c994dc3e97ad699b5551dc439b8f52230ca48bdd6a50d3ac3576440dcac4802e29e6f9ca4494f2d9
diff --git a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
deleted file mode 100644
index 2866aba1eb3c..000000000000
--- a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-# Build system copies the module from py2/py3 version to the regular
-# name before installing.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# resorted to sed, fixed in June upstream, bug ID: 3381439.
-	# See Bug #443836.
-	sed -e "s/26 June 2011 10:53/16 June 2012 03:08/" \
-		-e 's:exc.__traceback__:pe.__traceback__:' \
-		-i pyparsing_py3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/doc/${PF}
-
-	if use doc; then
-		dohtml -r htmldoc/*
-		doins docs/*.pdf
-	fi
-
-	if use examples; then
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyparsing/pyparsing-2.1.8.ebuild b/dev-python/pyparsing/pyparsing-2.1.8.ebuild
deleted file mode 100644
index 2fa1bdb8fc69..000000000000
--- a/dev-python/pyparsing/pyparsing-2.1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# not contained in the tarball
-RESTRICT=test
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	if use doc; then
-		HTML_DOCS+=( htmldoc/. )
-		dodoc docs/*.pdf
-	fi
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	${PYTHON} unitTests.py || die
-}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index ac8097471516..0fe9fe6991db 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,3 +1 @@
-DIST pyquery-1.2.11.tar.gz 43556 SHA256 4a832ba73bfba03486f5445c75993a26bf62d38d26ff5fcfbde06a7bd0087fc6 SHA512 56ee20e0aefdd290069151d5085a876d6502a226ced72bd43e3e88572f31eecee7abecf4bdd38a1a17685021328963e9fe45eaaac121dc880bcb6ba74b8df12d WHIRLPOOL 70efeec9e2c3b28656c2af8221c4e74794b3799ddddffc8d1e3bb4dd43e70ca8c932966d9e332fcfcb8df7b3f342c70b8cb11b8b1cc8354e9d88294053174f1c
 DIST pyquery-1.2.13.tar.gz 44032 SHA256 fbc95cf422ac79fa00c5107a2f33dff7dd106d6de569493bd938881b75d42e49 SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6 WHIRLPOOL 9dfaff7ee82e162bcf3c9ea9ee03320fafee158aabaeea8cd64fb592abf2386e81e240d1f966747707937c614e0164c9f73a70f480e2c6362da02805cee2c746
-DIST pyquery-1.2.9.zip 45289 SHA256 46c51eb878b787e814ee8f9737b0a62111034aeb4d1c06450ac5a8ea5a70e602 SHA512 f5152b471c896b39032add6a7f0e6ce63f426b4903bc7cf9eef12723c73453b40c310dd1497a7c4189fc6faaf804690fd91fb6d2f97fb6c4d6314682de4b8d05 WHIRLPOOL a57bb04402a3a8af98e7073d2b4e415a3e455bb67b4dc946831832f24339fe29fcd560123651abb3ae38c4ee9da3973638d27e064122702c0d1dd63d971fb67b
diff --git a/dev-python/pyquery/pyquery-1.2.11.ebuild b/dev-python/pyquery/pyquery-1.2.11.ebuild
deleted file mode 100644
index d3b9337a8a39..000000000000
--- a/dev-python/pyquery/pyquery-1.2.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
deleted file mode 100644
index 45846edbdf08..000000000000
--- a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')]
-		dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild
deleted file mode 100644
index 77eceda8f23e..000000000000
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')]
-		dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 98e8db4f24f8..fb20066ee9b1 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,2 +1 @@
-DIST pyrsistent-0.11.13.tar.gz 89444 SHA256 cfbf194cb33b97722f6a3d6efa7b6e7a93b09bb13571266cfc9c1556fdb26f29 SHA512 0911fd49598ea35a8a95cbda7ee28175b4708be1b3fe23340e731c7735e2436f6ec9ad390482e02dc51e337c6b9803920471ab76540b003e99a20b00649fbfe1 WHIRLPOOL 50a57cb2e2f2cd9d88587a229a890b0da46151bdb393b1acf5f42f3d6cfc58b561b5998ab9b7bcfd2c21c68d54c2929f2c017b3c1073d5f1a92c6f4865d51b59
 DIST pyrsistent-0.12.0.tar.gz 91666 SHA256 37e19cb03435a81507f3096bec2abfbe6a1bb4098f72159d0cd37f6f8394f3cc SHA512 dd0041011cb5aa41d32cfd632e80079a1e0e19f15366c928eabc040a85e9b574dc2d1a87139b150fa8ec42f6955ddffbf6e7bf8bfd9f498a9089632189949853 WHIRLPOOL b131eaf46a35ec5dd1cdc4818d271f784093faba1d50b67713429c84946811c72cd7d73bec1c5d3a44ac992ca4abbe347bd59155ae94d9703b749cd9f0ec8dd4
diff --git a/dev-python/pyrsistent/pyrsistent-0.11.13.ebuild b/dev-python/pyrsistent/pyrsistent-0.11.13.ebuild
deleted file mode 100644
index 17a528298f0c..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.11.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/tobgu/pyrsistent/issues/
-# fails
-#RESTRICT="test"
-
-python_test() {
-	export PYTHONPATH="${S}:${PYTHONPATH}"
-	py.test -v -v -x || die ${PYTHONPATH}
-}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 892f376aa30e..e9c677cc7aa4 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,2 @@
 DIST pyserial-2.7.tar.gz 122081 SHA256 3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477 SHA512 3fc8d9425a47ebcd37db1fcc58182854b48c9abd6642f35fba2d21458d864ae448105d704dc0d880832ba7516fa16f108f24363bd5fa9f083ea79a4ac614339b WHIRLPOOL ae6b4df86220617f7fbc1f1e4085a7e85dca645a6d84339163b40fc7a15f14b879ef7a729d3d23d0300f9ee04b21d6c24d13a791d520aef3f3ad141c6acd9b68
-DIST pyserial-3.1.1.tar.gz 147535 SHA256 d657051249ce3cbd0446bcfb2be07a435e1029da4d63f53ed9b4cdde7373364c SHA512 05b6f893454b187757c8d01c8d3951751ba93e87aafd474fa684a24198eed22f892181bcbab40101e74b25dae612116880690e800adedaf56a5c12775ed2b8d8 WHIRLPOOL d9d4b4894c94da9a357b27eb5e32766c0ff46cac751667f2f2195ca82ae2a2095a9df3ba219c10818faebd420912250a0dfcc6e86aedb7c4feaf6f553cdf4d52
 DIST pyserial-3.2.1.tar.gz 147338 SHA256 1eecfe4022240f2eab5af8d414f0504e072ee68377ba63d3b6fe6e66c26f66d1 SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f WHIRLPOOL 529c4eb12adf88579d528d3bd9dfec6fd7b43890217392677b7c8428f7ca7b3fe5dded863c4690c9eaa5ea37a2cdb56744e328a47a4b89d5440becceb983ecb8
diff --git a/dev-python/pyserial/pyserial-3.1.1.ebuild b/dev-python/pyserial/pyserial-3.1.1.ebuild
deleted file mode 100644
index 0b37f834e5b9..000000000000
--- a/dev-python/pyserial/pyserial-3.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc examples"
-
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Usual avoid d'loading un-needed objects.inv file
-PATCHES=( "${FILESDIR}"/mapping.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
index 6dee7c1f02cf..15b6908dced7 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index 9c7ae65c2b90..805172458bcf 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,4 +1,2 @@
 DIST pytest-runner-2.10.1.tar.gz 8815 SHA256 ecc9549ed1ce9bbfc9e7c9bad33d3f9fa91da2334632070a191a35aa96f0be35 SHA512 11c570051a0a7ff56fbb4fdc2a87185af6bbcccc05be012eeaefd775efbf21a3fb167a95ae603d627461b3775ee8cfb56b10d356044a4ae3966a7bf9f1b1f4a8 WHIRLPOOL c2a0c8a77abf5fedd31e0348a9e28ef60febbab7e4d18d7a8444fe6ca82f61c5f36b1cb183524ed9063e246cf6b8a76ca6427f3a63bba0e3c594e03e4a34fb13
 DIST pytest-runner-2.6.2.tar.gz 6379 SHA256 e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d WHIRLPOOL 968a38864b58d35d4c9fb0fa2855bae9f87bcb68936b5f129c5bc67b2c751e51bf5f9e5f54d27f36ccd6e89df7d4f8c4a6556de408cc8287f52725e1eb73fef5
-DIST pytest-runner-2.8.tar.gz 8535 SHA256 1ec44deddaa551f85fd563c40a4c483a2609aca1f284a95399566a74d0680d5c SHA512 bdbd71dc4713dca2b00fa63e8414dab0611af460c25746d5377881024c23e2c8a6f1374ab9c94fa33dae1ac2f0b7ba10f747287a3cbaeb5a44ff1dd4542e122e WHIRLPOOL 541421d6f2a8490c58fb1c33c7227ab685f9031626c8007f867d2bbc81c8913a3bcc709f34707eca2d239706eb86b090bd49024b8ee5111a4d5e84f9a292a2f0
-DIST pytest-runner-2.9.tar.gz 8601 SHA256 50378de59b02f51f64796d3904dfe71b9dc6f06d88fc6bfbd5c8e8366ae1d131 SHA512 2d92ab162282171d97bd931f790793b1abb01412dd54fca85e6f6fde1aa0019c1691a9a0a206cafcdd52ee57029fdda206646208493e1420a65a3c08c1121c10 WHIRLPOOL edf12d710d84b9fabbf430310215c704b4a0d4fba67ef75cdb447d6b9ee5c9e93bb82350ffeda7aeb1bfff180345a446a3a018a390e387fd5cb996b3b7cecd57
diff --git a/dev-python/pytest-runner/pytest-runner-2.8.ebuild b/dev-python/pytest-runner/pytest-runner-2.8.ebuild
deleted file mode 100644
index 06598964b389..000000000000
--- a/dev-python/pytest-runner/pytest-runner-2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	"
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-
-# Test not included
-RESTRICT="test"
-
-python_compile_all() {
-	# The build by rst2html.py makes non fatal errors building index.rst
-	if use doc; then
-		rst2html.py docs/history.rst > docs/history.html
-		rst2html.py docs/index.rst > docs/index.html
-	fi
-}
-
-python_test() {
-	esetup.py pytest
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-runner/pytest-runner-2.9.ebuild b/dev-python/pytest-runner/pytest-runner-2.9.ebuild
deleted file mode 100644
index 06598964b389..000000000000
--- a/dev-python/pytest-runner/pytest-runner-2.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	"
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-
-# Test not included
-RESTRICT="test"
-
-python_compile_all() {
-	# The build by rst2html.py makes non fatal errors building index.rst
-	if use doc; then
-		rst2html.py docs/history.rst > docs/history.html
-		rst2html.py docs/index.rst > docs/index.html
-	fi
-}
-
-python_test() {
-	esetup.py pytest
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 101b2b603f28..7e57822fafd5 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,3 +1 @@
-DIST pytest-timeout-0.4.tar.gz 10204 SHA256 d5900aaa94af5cb2d06ed806b1e636255e65a8a26eccecccd2b9a9d6123d50d5 SHA512 07031d64012e683064cd0bf2cef1d7209f02085e07dd8c7dfc704270d1e6ecf9679c639d529586c7d52d9425244a05ac362a7cd0092ca1f162a54539f58286e4 WHIRLPOOL b4befc271e378246d3e9fdd23a931fa400a981f79e90b0d44bbd533bea2be976fb4fcf73f6aa552d129e6945d82880bdf7bbf08c653c787913a8b782be54ab51
-DIST pytest-timeout-1.0.0.tar.gz 11125 SHA256 1465096be73e16df1e15d1b1453692428a7e15b997d756bc565aee0d12798ce1 SHA512 67a42562dfa7175c213ae50a7e152f04406f01a4821d69c9e95637a06a2574de8ce2f147030ff1417cc99eb7d518d7c59ac72ff2671dc3e7e813962da91e7591 WHIRLPOOL cc5f915b9a875d2c5886d6eee1329deb5c86e853cf65f3964364278ad6f6271cf05fbbe37960d14019d99dced0bfd5c84726f692c43930e51331b2e750604cba
 DIST pytest-timeout-1.2.0.tar.gz 13258 SHA256 c29e3168f10897728059bd6b8ca20b28733d7fe6b8f6c09bb9d89f6146f27cb8 SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae WHIRLPOOL b2155fd77c5c1fbfd5ec7679bc92f3aa9c28f67db47f2ad93f6e868c11787c5988a6e612f432c20a32d82d55acc43f520aa5a87b8a1155e98fb6da066cc44685
diff --git a/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild
deleted file mode 100644
index 938f25244128..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	${EPYTHON} test_pytest_timeout.py || die
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.0.0.ebuild
deleted file mode 100644
index 2b7823aa3bee..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	${EPYTHON} test_pytest_timeout.py || die
-}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index c0c23e9c953f..17b315a344f0 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-xdist-1.13.1.tar.gz 110007 SHA256 4382d7a944c1e2b1dc17fee3fd3575495fb10236a3b6e95cc6955db04984bc3c SHA512 3bb295c0afbcb0f238bdd41dfd1a395f0ba16b8151643aecc25aae13ac7c58d36d26ff4bab197673a9679d1f3436acd05b5ff50107b3128e647de892a6d04e3f WHIRLPOOL 643b23c755eb43c7b6965e588b58547c9ef63d3c225cddb97868c659ab3234bc6bc204575bc48c7f18a498cb0e595b8550928ba92ec5945a936e959f773504b3
 DIST pytest-xdist-1.14.zip 106585 SHA256 4a5e1199122fa29e3017d8d189f59ccc5d82e841474ba2a1eec0e89606153623 SHA512 4cafae77736da6880e8dd42aaa91f68bbc959ff7dabcd231018b144b54f96ccf1b11abb09474e260876bbdf731053005fdbd348ac87461f303d8f8f7af643e36 WHIRLPOOL 7d1f57a6d5cbf08661254f3f47d72c3cfbe931f14985c4b24abb627bd10fdc3f2fa21d05085766c0ed425e74713f991b53bdde957bd64ea4f64a206c2f4feffc
 DIST pytest-xdist-1.15.0.tar.gz 87799 SHA256 6238395f8bd050f9288a3b10f34330edece80f4424cf2b4204d6e7d622f0f00b SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed WHIRLPOOL 0454f615c24b14a86aba58c7bc9dbc2b43af82551ae3912358603450f0e3ac94e849eb2fc57bdda8bd1de5201111a3986d2c12c9f2923f4296718ffee84d661b
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
deleted file mode 100644
index 9ec91622caeb..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://bitbucket.org/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	find -name __pycache__ -exec rm -r '{}' + || die
-	py.test -vv || die
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild
deleted file mode 100644
index 897f916e1c81..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-python_test() {
-	find -name __pycache__ -exec rm -r '{}' + || die
-	py.test -vv -x || die
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 96b807809a9c..82cce9ec04e6 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,4 @@
 DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
 DIST pytest-3.0.2.tar.gz 727551 SHA256 64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339 SHA512 38485c73f9df3c76b7b920b6957ffe4fbfd32ca0c46b73a53375a40586a482d270bf71b4457b68d48815d50ad173824b269ece255692ae0d1b13f0b1885ce54f WHIRLPOOL b6954a95e5f7d9b904c7543a09c2ef237c76c3a35bcd3e24c402a02aec3b35a19cdb952ac38af4ce43ae516cb5ac52023a0d91f2c587343265edd6d493145e8a
 DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
-DIST pytest-3.0.5.tar.gz 740656 SHA256 4a003aa956f023ce91aa6e166b555e6f02a4b0aeb459ac61e14f64c0d39037fd SHA512 b01c6272703ec93b7e7eefa584688a3d00cd97ac9cf54bc9501b596d4c370f9f74e06ee2223829b60469ea1a32c3a3c30b29aeacfaab1f23404d5f8345544ca1 WHIRLPOOL 9b044222fc628dd138e9eaaf27a930b6389e74dff09ec25c07392c4d965c30890a79f5fb663db6de4f612dbabd6338049d2ed45679928835f8c7a278530d6c05
 DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e
diff --git a/dev-python/pytest/pytest-3.0.5.ebuild b/dev-python/pytest/pytest-3.0.5.ebuild
deleted file mode 100644
index f6688a086761..000000000000
--- a/dev-python/pytest/pytest-3.0.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-COMMON_DEPEND="
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/logilab-common
-"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 2be691b067a2..4d127a40e31e 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,4 +1,3 @@
 DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468 SHA512 cb278b8e18da3b991c6415ff59e9f3aa87cfb2e52048b3f74a9e3d183e0cc5bf71595123c644d0aea75084e653a885cbfa70c8ddd8b6a888bb13183624fcb46b WHIRLPOOL 545495d466cbea8f750b7e997699e2466131ce780ed73e18a880934a5255f759cee470b6f85a16a44f62bacaad14490e72a212c4cf6e53f0fe69b87492f9d055
 DIST python-dateutil-2.4.2.tar.gz 209120 SHA256 3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d SHA512 8e38721e6d132850f85e7808d2731285d2c12eae2a3e0cbebe05265d0837ad22d4d94b611e146028ea3d23a3e2611b281dd6224081a69dfe4b58cf3b378d7f0d WHIRLPOOL 88ddb75f52a95a6b7197b41364b80968bf2c21a3bda9c7b992726ef35ca934a66a5d8ccd773d7647f985541d87c66fa94af13600b0165707af9b73d1bff8887e
-DIST python-dateutil-2.5.3.tar.gz 236877 SHA256 1408fdb07c6a1fa9997567ce3fcee6a337b39a503d80699e0f213de4aa4b32ed SHA512 413b935321f0a65fd8e8ba49990acd5bed60b9bcd614837a26c1cf52ecbf268543a97791dfa7b91ebf183866a8de7be302ca7d18d10352e897994f60bce5df62 WHIRLPOOL dd199467d5ddccb7a82b0f08d3ccc5695f542e62f7bddc1d9b01fefcdeb91cb119a5978901b0bc84af0d69482e7f984fa512e5978a1e791753b1c3ee64c87103
 DIST python-dateutil-2.6.0.tar.gz 258060 SHA256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 SHA512 1fec6dd6fc00650821fd826405414bcde79e1542a53608ebd837e924b4abc147a369214ec064adbff682fc5ff67440086f3000eaa77b274c7463c3f58686ced9 WHIRLPOOL 1cae1f1e3dfe09c3215bba031ee5a604ffe86bae7b70999320f37232ddaf5401edbb56697157b9b89316220d932faef07e7d7e6a2e68992fc17bb91bf86b24b3
diff --git a/dev-python/python-dateutil/python-dateutil-2.5.3.ebuild b/dev-python/python-dateutil/python-dateutil-2.5.3.ebuild
deleted file mode 100644
index 9f4ad2c27a3d..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index a9adca3431f0..a6161647c665 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1 @@
-DIST python-engineio-0.9.1.tar.gz 11812 SHA256 30af19dfe0dba55ba080958d2e251a3bb528c2502b83b255b46c4d90fa1db650 SHA512 69d69e6eb8a577ccf3bdd960c6e32c43111a174458291fe5254028e70f5898644896db67f4884a0e25ecdf20de69521d320787bf75917fffd508d36b11772f01 WHIRLPOOL a13bd82e6d09572466d16fd1771e8e6f13289304a2979e0577e6b37310c9e86d3f122a62e8cca39db289e87def98502ee359778845de39edf264efdf6bb559ea
-DIST python-engineio-1.0.3.tar.gz 14801 SHA256 30803f9d3c327a27bdbf6e55a9772c858082c69de87b750ff981effd47386e5c SHA512 09d610bf88cda61eb2232436302eedd46e14bac5071ee298585e731f36ee49449272290b9b3ce34a16d4c37c3598689f5772a0b5162628311d506ad60c0c0ad8 WHIRLPOOL beb558dc726c33503db81cb25489b612fa5e4755646f8b2bab0d642b2d0da5cc813997094b13e4a9e47861e688a7da5310b630351c6e862b2f00f71de3d282de
-DIST python-engineio-1.1.1.tar.gz 13758 SHA256 429cb9120355427138079108057d32824c084f24ca0858d41effc6ec115b0989 SHA512 54c4ae979569e98e6ff0439faf45ccfade4bcbc9b2947805fa9b2b88b40a5ed78f06f64cdf403d76bdb4a2d7f2b1ced2402a179ceb9e924285f96afbe285ca10 WHIRLPOOL e0fcb46c24d22c84337ec8ec4ff06c2b6294258e0d9f69b723d41590760d86eecf302bf602b2582a2212eb1482e98ea1c4753d56e5d5383fb1aca8672f59fe1f
-DIST python-engineio-1.3.2.tar.gz 19740 SHA256 2e441de79dd8937712c3ec293d8c93cdffbfba1bce095dd59eea91af7fa0cc43 SHA512 29c0fb951f467126cd6097c9ed07836835f4a39a7db49be99b331e0bcc9f412234e8c337bf51a14d61182bef70ec1aee8877f692b276a1154dbe5f09904f897f WHIRLPOOL a30b7ac1238b0f17524217387bf97ba68ca880a702c1a781426b6494cecadc56955b689e189cedc57cb317c1a727cd16c6770872f578f3e8bf6ad78f132c614e
 DIST python-engineio-1.4.0.tar.gz 20829 SHA256 488f7761aaa4ab84ae4356755efe0e689de1dbc98052c9533a3f1aa9ce13e8c7 SHA512 ab32361d91b0c982a41f7fde7769912e13d8ea9acd9e99cbc36c84cedca2241a175b3b49582589b821457f13270b2beb0c90a9592b7b9dbf625d82fcc36504f5 WHIRLPOOL b9a8f3479c1d3e6c2fd1f14aa88775e09c3de9ce831d761912d03afb58b506232b364f07e4e8a76ebbab379a4f15649397c7a89cbcc65d572db5b3d34710dd47
diff --git a/dev-python/python-engineio/python-engineio-0.9.1.ebuild b/dev-python/python-engineio/python-engineio-0.9.1.ebuild
deleted file mode 100644
index 241b9b948678..000000000000
--- a/dev-python/python-engineio/python-engineio-0.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-engineio/python-engineio-1.0.3.ebuild b/dev-python/python-engineio/python-engineio-1.0.3.ebuild
deleted file mode 100644
index 241b9b948678..000000000000
--- a/dev-python/python-engineio/python-engineio-1.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-engineio/python-engineio-1.1.1.ebuild b/dev-python/python-engineio/python-engineio-1.1.1.ebuild
deleted file mode 100644
index 79b87ae20f88..000000000000
--- a/dev-python/python-engineio/python-engineio-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-engineio/python-engineio-1.3.2.ebuild b/dev-python/python-engineio/python-engineio-1.3.2.ebuild
deleted file mode 100644
index 6f3b26b71d31..000000000000
--- a/dev-python/python-engineio/python-engineio-1.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 7cab9cd71180..580f9adf7e34 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,5 +1,2 @@
-DIST pytz-2015.6.tar.bz2 156925 SHA256 01eed1b2226dc386d8e467a2ff8c4f1aa08c65d5d7e7c43aa094bd45d5bd68ba SHA512 e6e117d85c0a0310b115cfaae2b9d5957641f8367a7890f4e1afed8129e77c6a08b733b985c06d5f3fe5bbfa565387826883864b79dd4946065561a60ad24f35 WHIRLPOOL 255684e9f24353aeda2f26fc89216aef3b34a87a74df4dc758f87da31cedce6d372d405d37e8c538b786324c6ce03da177d3429438999ecfd744009fd7bbbbe9
-DIST pytz-2016.10.tar.bz2 172920 SHA256 7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b SHA512 a571dc035d713b05e1fe5760ddbb7701492c78b2faf38455ffc147c1d68fcee8d6f2d43a9d12724561ee2b1ddd83526d6ac44629c35899080f22a13abe854346 WHIRLPOOL a896e2c46e17891ab7455082003716e891e8916b5a3e3c0d776b4af7e17479c861537c4ae3a232f3288bd3302bd556261e4c81fe2ce72e0bcd179dd187722145
 DIST pytz-2016.3.tar.bz2 170906 SHA256 c193dfa167ac32c8cb96f26cbcd92972591b22bda0bac3effdbdb04de6cc55d6 SHA512 8d91a84500257327361a8ccd19ce2d2e5848c10c7d4105ec1be012be592ec38113611558c7894c1825cc1967303901fce35079fc799cc10e84216864cd00266f WHIRLPOOL b2af20a788fa70c23b04cda3acdff812c30713f00a9aaf2144d85c64341f6fe4e365b558f3f0b5491c6c99ebf633d2d3910c95f7a6ae1f9c53b40da6bcbc23af
-DIST pytz-2016.7.tar.bz2 170973 SHA256 6eab31709e3a4aea748457707da45e805b650cbb352583805d2417de2a1dd71e SHA512 2c7d4691a0f49c732c8fe97f0df70b7ce4d7b8bb6c1d3db590dce78152cac46443cf5900d38d35472d92b2b8ef3654e0f67066279a7a1d357eac24d334501f3b WHIRLPOOL f286cd1cf735f1fe12aadafd4567ba037d81a88749fbf34d78052d20c80b5d6fca676fc43c35250bb935b3c3a5497d64ac1bc9af99d86bd2f911874d807bd2e7
 DIST pytz-2017.2.zip 502168 SHA256 f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589 SHA512 d67d64a64b4c21e0bd41da56020fc7b016aec9da7f3243f79b65704119f70b8a9cd4f5f905631b6761e06ecef93830e5e479e16c7b1611ac70e0cd2b39d5b916 WHIRLPOOL 3a8e5e0c71ba12c8083592582238a17c1db862c1f779e84b4e93dbdadf9f5445d11d7725bc40f8d340569d2374adbf0ef19886c595f2d766a3dd7c57742cda44
diff --git a/dev-python/pytz/pytz-2015.6.ebuild b/dev-python/pytz/pytz-2015.6.ebuild
deleted file mode 100644
index d241f8237442..000000000000
--- a/dev-python/pytz/pytz-2015.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=sys-libs/timezone-data-2014i"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/${PN}-2009j-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2016.10.ebuild b/dev-python/pytz/pytz-2016.10.ebuild
deleted file mode 100644
index 06e29c3a746b..000000000000
--- a/dev-python/pytz/pytz-2016.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2016.6.1-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2016.7.ebuild b/dev-python/pytz/pytz-2016.7.ebuild
deleted file mode 100644
index 06e29c3a746b..000000000000
--- a/dev-python/pytz/pytz-2016.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2016.6.1-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/readme/Manifest b/dev-python/readme/Manifest
index 855de0632e93..5732d73582c6 100644
--- a/dev-python/readme/Manifest
+++ b/dev-python/readme/Manifest
@@ -1,2 +1 @@
-DIST readme-0.5.1.tar.gz 9917 SHA256 4d33851d7fa56d1f93b7ba979ebbb17b5175ccde9fd9dfb974427bdd72ec667b SHA512 50cbd71e692be0b6cba06d85765946aa2d2d751f3f44563c5a6902ecc982658e5e3b1e01cbaf50a4df4dc61a56290e67b71eb88c109cbb830af36f0d334552c2 WHIRLPOOL f53d900d9764c59053db1350fe059a45d1faed43f7d53468ebf3d88dfea44fe69ffb22e80483e69c4b24708fd75963a034e429325b5844375a11202ce7877a23
 DIST readme-0.6.0.tar.gz 9938 SHA256 150c55626d2be4237616d84367b789e398f4d416029e5c62b09fd1688fe14222 SHA512 73c41c728171a18a963460459aa19d559f38ad34d54a9840820feb1329a0d71c1b0eb32ce773a4f8e9d361e534bfd916e376fe1a3fe8b8a9eb91fffac3ef565c WHIRLPOOL bb45daa786a26a0c3ab7b16583b13d56e782439a06ef53a87a94d60bfb2e6220eb65fc75d7ebfc77d5f6bb3b299438f1c00e88d7edf391ad95231e18be37c523
diff --git a/dev-python/readme/readme-0.5.1.ebuild b/dev-python/readme/readme-0.5.1.ebuild
deleted file mode 100644
index 5d0a865a6f54..000000000000
--- a/dev-python/readme/readme-0.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme https://pypi.python.org/pypi/readme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-python_prepare_all() {
-	# remove failing test for now
-	rm tests/fixtures/test_rst_008* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index 4057d9772b63..46c2b62143b6 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index e79c2f354bc9..9b88031d0288 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,7 +1,4 @@
 DIST requests-2.11.1.tar.gz 485936 SHA256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5 WHIRLPOOL 838e3074f56a87766ebeb04eb75fdd6f5c83da7448b5e9297be8143330acaeae540d10939b7118cbd9e86c1749c8db5c6c22d50064e704b9c1d7278a37a48af4
-DIST requests-2.12.4.tar.gz 547650 SHA256 ed98431a0631e309bb4b63c81d561c1654822cb103de1ac7b47e45c26be7ae34 SHA512 100a38ad4bfe5c02c44ccfa75473da4b58416690985117750a0c2e1851e98267df740f578f6a5ad27d0a5b9de2954988f832ea1a169fffc82e8e2da15742f855 WHIRLPOOL b7e1ef3357edb36e7f9c1baee342706f8ed85b2a24d15bba9b48caf023ef10a43f43102be17e5e29cb6bfe3754d9f5f9ddb6d9fd3ad6bae11e249cd066759bb8
 DIST requests-2.12.5.tar.gz 548336 SHA256 d902a54f08d086a7cc6e58c20e2bb225b1ae82c19c35e5925269ee94fb9fce00 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9 WHIRLPOOL bc347e966743a940c09ed9bc98fed7422648a9b0354d36aaf94820fb306169842fafe5d34a48effb46547bb44fb46b2499cb1ba7dfd3ec029426cf97418d9c68
 DIST requests-2.13.0.tar.gz 557508 SHA256 5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 SHA512 d3e9c25d1ce7ecf51bd4b137645d06c07170542a78fc847b1c30cad6efa9bcbf36d4b0c809389cbf260dc7d73128ab6bbed1e197cba9497b6ad791b48014ae14 WHIRLPOOL febfabea45aa45093eb04758f40a35b6479e16f833fd83abc798d2b5786bed025bb00c45e8dea9161aff735bde693573e6f5db7e5ee09ad3d2b140673e2cbcf8
-DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
 DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
-DIST requests-2.9.1.tar.gz 484252 SHA256 c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f SHA512 0b2b64b2ebb68703f2a222a3e5d0227cf15250319195a13497e38959c64b82359b70221157eab2ab828dfc79bcfec13ede4d6272f0202ae1b22ae79d5810adb9 WHIRLPOOL 9d942b97168c8a869b703db324a263ed3f5279a17e18444f7311e3d3a06aac99ef939c1d3f966025d6ac9e2967415880669b3bac6766c2d39c2faee43cb146c3
diff --git a/dev-python/requests/requests-2.12.4.ebuild b/dev-python/requests/requests-2.12.4.ebuild
deleted file mode 100644
index 65a15ac50e54..000000000000
--- a/dev-python/requests/requests-2.12.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	>=dev-python/urllib3-1.14[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12.1-system-packages.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet & urllib3
-	rm -r requests/packages/{chardet,urllib3} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/requests/requests-2.7.0.ebuild b/dev-python/requests/requests-2.7.0.ebuild
deleted file mode 100644
index fdd019cae026..000000000000
--- a/dev-python/requests/requests-2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-# bundles dev-python/urllib3 snapshot
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet
-	rm -r requests/packages/chardet || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/requests/requests-2.9.1-r2.ebuild b/dev-python/requests/requests-2.9.1-r2.ebuild
deleted file mode 100644
index 13f4d3a8a07b..000000000000
--- a/dev-python/requests/requests-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)]
-	>=dev-python/urllib3-1.13.1-r1[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-packages.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet & urllib3
-	rm -r requests/packages/{chardet,urllib3} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index e21e5e9dbdae..c55109efc5e0 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
+RDEPEND="$(python_gen_cond_dep \
+	'dev-python/regex[${PYTHON_USEDEP}]' python2_7 'python3*' pypy)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index b2ac60e4527b..e27e38c11c43 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,9 +1,2 @@
 DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
-DIST rpy2-2.7.2.tar.gz 176481 SHA256 b8c376c2bb78a602effa44c654633f7a11b9bcc582aa3d4828a11302bc290e21 SHA512 d282e81cdd4c69ac4655d019151e2c7ce0aaeeb55479f7f7405ed16ac4124d2f3eedccb37a7d563deb0d8beb69e5ede4d6702a3872b554965442a38ec545f1f4 WHIRLPOOL f19182a1ef392d1b4029ebd984d8828d92ea3bf14c9375490fa099d7a2f82e99c75eb6475dba1d11270bf76dc94eee490157e22ab2c083c51a90b3c1d1a56b7a
-DIST rpy2-2.7.3.tar.gz 176854 SHA256 fc66a4efa113b48ac32cd4578d5fce551722cd64c5eadafdcab36f074e9e785c SHA512 dd0e5eb896bf809d4d342f7927c5bc014b78352df87219d9d0839622647c35f256a256593d526be2faf369ccd98d74868e1b6b3c99ebc830d08fa4cfb8c35121 WHIRLPOOL 735eb08c1528c27f2362d42e08cf9ff5c31cbcdf706eefb873921ed9eaeab4d9004b80335d36672b3711dd8a8515d51d451a1f66bebe4a4d4c9ef1f32e758685
-DIST rpy2-2.7.4.tar.gz 177030 SHA256 478f40c6775cc04188818d0410cd8340d900bd782ab3fa734cb6c090ecd57ddf SHA512 8e228418e9721021de588fc91afb87b0fe07d6f84c325a093415442c57d694f557f1672a270f1984a693f753be9e2a49c80717b1f5cdcdc616509d4c88962651 WHIRLPOOL d350d27ece993c0f6a348238c8888653ced225184be1e98ddc1eef6a8774e1564da2f51b7bd3342b88241c4f7fe4484cb9488c729222eae10208c06ed93d30b5
-DIST rpy2-2.7.5.tar.gz 177407 SHA256 0d88f7fff21fbef523c8678ed8f850a36052edca4ce702c62f234fdcb52de441 SHA512 132618c42688302145f3df17b2153a40e57a9e3ada0b98c97091349794fcf79c03738dadcde5f3553bb915f6bec5a91812484e7886ce9d61033daab0ad5e62d8 WHIRLPOOL e8f8104add0b2e3ba1f5b0423c39e10c912252b9ba5f47b1fd572f3b3533a224fc689dc247a1c78c7ad2899983e5f494c5477c40f704fbbcb268d75d956275c7
-DIST rpy2-2.7.6.tar.gz 177562 SHA256 ea35a2f37fd36e8af069731bf1421fbb2d3f8550bcb55fde3bebf0bcb1b00a5a SHA512 03c1f62aa367049815504ecea8bb3ff82dee779167ab59eea148e8d631e50151d4ce1805327ddf3b06821a767aab162c613a32d73e814a832d79158b455aab9c WHIRLPOOL 2df3db91e8a8132dbf25703fbb60aa7f17eb63faa56101c5e1697e9a37a21b7545629382643ac5d9420a9953c4d41ef2dc196dd50547d4d1119ec08fb5e0262e
-DIST rpy2-2.7.7.tar.gz 178098 SHA256 bf17d49c83f856a9ca537a7746c5e5edced23c3a181b89b61cb959a5db90339f SHA512 66bb901150d256a2373aa52a4d05bd5cb93acf58e3f21cd55bf5d0f8f204953898b6dc5ebffa26e06b9ab76982a1cc31f0011b8520a059b071033f54e0b8836b WHIRLPOOL 1621345954c54b7250a93ec8fb1ca1ce110d6d9e4391ca023436eef1a70c69b4cdee0a8b01982706e4b6daba5f0fc74770b0ac4517642fb6c4d4ed148ef4eb97
-DIST rpy2-2.7.8.tar.gz 178334 SHA256 4f51bcdddea01a63e624f4b38de4f6b10a2466d82fd7e890791a07b06e51781d SHA512 adbc83c8003963219038b541e0b5d1736eb515fda77e277462e87cd1dfdc39b225bb73a659f62dc7fb1d7678a415047153fa4861328dc0ecf8ba450b3748150e WHIRLPOOL 4c1ffcbd88875223d80f1b078dbf1d8c59b85765b8b106a577d00f0d219560dbba6f5d2b7b66ac59434791781c0b1665c5bbee19f402fa4e1a0fdaa6b4db3852
 DIST rpy2-2.8.5.tar.gz 184190 SHA256 09c63bc934d666f4ec16e74caf52eb516e035557407a93591e8da694a1718ca6 SHA512 737649bea67f0cb2a73dfedfe6f342b52bd8e73840b0da6eb64c8a61d25665d74394df6070ed67ec7a59632798e12fce05225e5c1ec5de587f1ae40ce5074b99 WHIRLPOOL 2e6c449ca766ff73a20abff12ef6df5791a77d2ca3cf5e90862700370bddf20b9b4ded65c870ef84ab840bb282d66cffc10c078a4417a8e1074dfebc7d87c421
diff --git a/dev-python/rpy/rpy-2.7.2.ebuild b/dev-python/rpy/rpy-2.7.2.ebuild
deleted file mode 100644
index 86d1c5d516dc..000000000000
--- a/dev-python/rpy/rpy-2.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.3.ebuild b/dev-python/rpy/rpy-2.7.3.ebuild
deleted file mode 100644
index 86d1c5d516dc..000000000000
--- a/dev-python/rpy/rpy-2.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.4.ebuild b/dev-python/rpy/rpy-2.7.4.ebuild
deleted file mode 100644
index 5cae95da41e4..000000000000
--- a/dev-python/rpy/rpy-2.7.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.5.ebuild b/dev-python/rpy/rpy-2.7.5.ebuild
deleted file mode 100644
index 5cae95da41e4..000000000000
--- a/dev-python/rpy/rpy-2.7.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.6.ebuild b/dev-python/rpy/rpy-2.7.6.ebuild
deleted file mode 100644
index 5cae95da41e4..000000000000
--- a/dev-python/rpy/rpy-2.7.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.7.ebuild b/dev-python/rpy/rpy-2.7.7.ebuild
deleted file mode 100644
index 4c04991530d0..000000000000
--- a/dev-python/rpy/rpy-2.7.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.7.8.ebuild b/dev-python/rpy/rpy-2.7.8.ebuild
deleted file mode 100644
index 4c04991530d0..000000000000
--- a/dev-python/rpy/rpy-2.7.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 74ae7b281e14..db206ab75e60 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,3 @@
-DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7
-DIST setuptools-20.6.7.tar.gz 675428 SHA256 d20152ee6337323d3b6d95cd733fb719d6b4f3fbc40f61f7a48e5a1bb96478b2 SHA512 91a212b5007f9fdfacb4341e06dc0355c5c29897eb8ea407dd4864091f845ba1417bb0d33b5ed6897869d0233e2d0ec6548898d3dbe9eda23f751829bd51a104 WHIRLPOOL 553a1579991e9478b8eb8dd2f4ab042cd5286c1233f325d1fe1c08092035c6346aa454c03307359d7dd562174133247200c3a5424f5fc24f4718db0ad80d84fc
 DIST setuptools-30.4.0.tar.gz 655934 SHA256 2bea341aa5b48ae05521374d9c473713e42dde7f8712a731904a6f8257e896ed SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515 WHIRLPOOL 4866efbe00d23291ad07b401d7924f2f150a38664ab0a3d9afe9e00aa4e887de6c9e82f81e7d2ec157b1bf05406b2616a08772fa9f3a45e1e20fddbe27c11fd2
-DIST setuptools-33.1.1.zip 702770 SHA256 6b20352ed60ba08c43b3611bdb502286f7a869fbfcf472f40d7279f1e77de145 SHA512 15fe2009166621ab0ae7480c5331accbf8fc9cd9e2943999abaecae9eba870634a0914f7829711e43cab4e8da6b6140c1586a9db9bb4623662dca6f5482bc49c WHIRLPOOL c25013c4a2d94f1eb162c992c85a8f66c99213e1c79dee25d627cace85164a3d3b81e7bede3e839f64ce29e5be4f49cca306bf6c9447412796636bc21f023b38
 DIST setuptools-34.0.2.zip 617839 SHA256 a5bdc45a3c123a88c84e089a789ba70bbc61ee888c1306fd9dac04e037e81c37 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266 WHIRLPOOL c9350f96628957c0bab680a2cd018d27d93f04afded737b317b9ea527e0bad3ea9c4f4af2a31843a3010573cdb0ec1c7fbdeef371cfc8cb5c8de93b6d762bf1d
-DIST setuptools-34.3.2.zip 622899 SHA256 4efcdcbc0b268a4c5b1094b36dd5ed55658968195577ed331cec9b1c71891f31 SHA512 f2f849a505c80bf93825d8136df4b3198a8041bfdc183882a8d2194ca1376b3e3ea24f56d2975eb374be54923e8bb45c7afeedbce86798efb31b1fb9e3b6c371 WHIRLPOOL c7a53c8f046b6ba548b0ad19f0d6ca23a022567b49ff6fecd4e06d4ce86487e7bbacaa48b58889f443acd5712dc1e67009d971722971aad9338a0876ffc317eb
-DIST setuptools-34.3.3.zip 622967 SHA256 2cd244d3fca6ff7d0794a9186d1d19a48453e9813ae1d783edbfb8c348cde905 SHA512 e45552954864b3b53319807a1593e8d10fc477f1a864da73560a17760f5239eca1cb338ad822c6680cb26c8e15897163122e4e9b19e76ed1e6d1542ffe7a6d34 WHIRLPOOL ddbc9e3ce6466416c3687fd7295dcc4f77aaf059550542cb9d21f31359adac0bc0b2281c755e1867db18ed4f4192e6951a0d78c34ae4bfdc46bfd8411df1e75c
-DIST setuptools-34.4.1.zip 623937 SHA256 704cc0c9fe6c97edd3c6370d165c5a754dfde318b671058523ed3226d944ea1b SHA512 cd0b3fafe87fdea85b6f1c72fd6bfa138592cde2856d0d9336078443d05f55ef61fc764ef7428708578bcfd85ac1919eef0c8ceb4f3e90c26e7a128c17150f30 WHIRLPOOL 0133154e25c2c8a4b2c92aeac99f0c0665ee692d0798a5f5f1f642e7d4d10f1740f6deac414bd0cad388ffc64c0eeeb78097d28440bea034ac74c43bde7bb804
 DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341b78b2365c71306eaa7316beac SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d WHIRLPOOL e33041a6f03dc4ceb4a34db4c18a4d76a908b4e5a726ad18598cc202aca24df0a81241aa72812b7a31b1e452dd265e813c58ea23255e37a75c2c2ec2f73d8787
diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild
deleted file mode 100644
index 1a953517db6f..000000000000
--- a/dev-python/setuptools/setuptools-18.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://pypi.python.org/pypi/setuptools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	rm -r ./pkg_resources/_vendor || die
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-20.6.7.ebuild b/dev-python/setuptools/setuptools-20.6.7.ebuild
deleted file mode 100644
index 30c2a77c586f..000000000000
--- a/dev-python/setuptools/setuptools-20.6.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://pypi.python.org/pypi/setuptools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-#	>=dev-python/packaging-16.4[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-#	"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-#	>=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
-PDEPEND="
-	>=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-#	rm -r ./pkg_resources/_vendor || die
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-33.1.1.ebuild b/dev-python/setuptools/setuptools-33.1.1.ebuild
deleted file mode 100644
index 3ccdfac94c64..000000000000
--- a/dev-python/setuptools/setuptools-33.1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-#	>=dev-python/packaging-16.4[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-#	"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-#	>=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# rm -r ./pkg_resources/_vendor || die
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-34.3.2.ebuild b/dev-python/setuptools/setuptools-34.3.2.ebuild
deleted file mode 100644
index 9bdebb0a0713..000000000000
--- a/dev-python/setuptools/setuptools-34.3.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-34.3.3.ebuild b/dev-python/setuptools/setuptools-34.3.3.ebuild
deleted file mode 100644
index 9bdebb0a0713..000000000000
--- a/dev-python/setuptools/setuptools-34.3.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-34.4.1.ebuild b/dev-python/setuptools/setuptools-34.4.1.ebuild
deleted file mode 100644
index 9bdebb0a0713..000000000000
--- a/dev-python/setuptools/setuptools-34.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index f7aff21c9007..8074bf9c9526 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,7 +1,3 @@
-DIST setuptools_scm-1.10.0.tar.bz2 16093 SHA256 080fccdf74121d8239aff8a17574123c9d2369dadf82178cf565422b2973632b SHA512 8a7eaf56dbebea08f12d4444606ef36033fbe9a0b725f92245d600a56d051988a87b73c43c7ead46a8ce4f83593db4b5a8c77f6dd331bfa381c7348f72743b0a WHIRLPOOL 9b988f77b5905f34da687b04841f606986e804ceb57f7aa2ca1de69a8e9b925d23325cf5c7db9be3f9b1f7051ebf3af0bd198ea0fc891dd7888369c962e5ae19
-DIST setuptools_scm-1.10.1.tar.bz2 16244 SHA256 1cdea91bbe1ec4d52b3e9c451ab32ae6e1f3aa3fd91e90580490a9eb75bea286 SHA512 2e38b9cf00b168ff95b3653feee1a15234cd8421f1e5dbe435172af3a711de548b07e790c6116f024c888889fa21b1216bcc198fa79c5d68194473fa45d48fac WHIRLPOOL 7ad39aa819d51b3ebce0f28ec71f75023fd8ff719eca8c29a219ee2e38707edae99d94e738d0b30ab5c4f8a012a77cee5b23c9808498f366ad95dc2c3bf5cb05
-DIST setuptools_scm-1.11.1.tar.gz 21262 SHA256 8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf SHA512 f5d814e65e273c78ef0aa8a8b479deb25322b0d23d08b0787441611cefcfeab1c6449459caa729453774b599f2c9dec807bbb2df308d26dde0b4af3357034023 WHIRLPOOL 3f08cf64ad880bc4b5661f2230d2ac59e66a3ecafcd281735337e94d89fb5af3d7d9b9ffa148ec9f11a72147aa18dadc0ba2641da752b83cfda62b2c47650954
 DIST setuptools_scm-1.15.0.tar.gz 23677 SHA256 daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d WHIRLPOOL f185851ee05cc8dd538a6b81e2a17a6155aca5c091e9dac5c56937e559551106147e12df8ba1ff97217f1e411cb8d34eadd40220850dd3010e52ad96c5f8a93a
 DIST setuptools_scm-1.15.5.tar.gz 25752 SHA256 145b2a8a609e0fd66108a92a06fe62d0fb329c0eb944f2d5c7ae3ca24222f29e SHA512 4d6f648dbdb90845a8e61c58bde06f3ef65898f9195b4dc97c40662d4cbeaf952f35c29940acfac7315b6ce6201a3af1d2eeab11274a8eaa02c7429c646c369f WHIRLPOOL 4a96a69e92fc256497c1300bcac47615929776e88dafe0eaad670d9337e83aadf38f91fb856f4e518cb811f3cd0c07097820850730f49d828f6c4ac2078e4ebe
 DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
-DIST setuptools_scm-1.9.0.tar.gz 17669 SHA256 b17362734ea2494a5fee611a2b3f09c251356fa5b9ed4567b666fe91105d4478 SHA512 e44cd8fa4e6badd707e8987e0d91f79d6dee4cda3dbab42bba70f661a66b841cc16dc9b59b35fecc0948b80e6ef198fb19f267aa839e32d09a543f3b724645cd WHIRLPOOL f688f00d2c700946ba17bc2acbc357412569068063893fd72414ab41d5e4e3360d410ae3e48b837ddebec5979e7e024ab544e75556b428d5e2603edf2b82acff
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
deleted file mode 100644
index 68eb2448a6f0..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
deleted file mode 100644
index ff8ed37007e5..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.11.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.11.1.ebuild
deleted file mode 100644
index d00aaadcefe6..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.11.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild
deleted file mode 100644
index 0409f009a375..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 1d76be7a1b7a..345a00b44485 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,5 @@
-DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 SHA512 b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052 WHIRLPOOL a40c4d0f5c32cf1d4b9b662b0fb2b2b0956e0455abbc88d6b5f95c54f93cc2baae25e8b9196dd0b64090d30a1a796c336ca4b6866243be4198ccdf67a7e18b48
 DIST Sphinx-1.2.2.tar.gz 3143671 SHA256 2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c WHIRLPOOL c5ed15b51682d3be9f8349ab838c6758cb4e25023b6ad13622d748b771594ed75f786709a25fb2d61ad245ecef0925e5bcc1aafb93fc355a0f0ea50df63efcd7
 DIST Sphinx-1.2.3.tar.gz 3200548 SHA256 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 WHIRLPOOL 0c0e2e21a52829893857939f977e8312c4eac11f5d2aec3b8e4f9c8ffdbf14c4aa46a6c26dac0ad4abfe92b3bdad72a3468e6d2ff2485df6efaf3fccd17ae69b
 DIST Sphinx-1.3.1.tar.gz 3469782 SHA256 1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94 WHIRLPOOL f3e442fd1f1c260b21f3e2381f028884b6247758448439e7be4cf784f50ec12494e384c77a0c4ccac473f25d7bb88f5424be937d72bb3fac1b6f6387a5746f66
 DIST Sphinx-1.3.5.tar.gz 3679978 SHA256 b7d133bb4990d010a2ad934c319b52d8a2156cb0491484f5e2a558619bc9ae04 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc WHIRLPOOL 5877015f700ed0818e0879868f2190ec818d088e235d9c12fe6bd472b0006bd8d26156273023ff93a098c8503bdc440cedd1ba8758fdc25f742bb5794940559f
-DIST Sphinx-1.5.1.tar.gz 4397246 SHA256 8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5 SHA512 ec06998921663c0e01096743c7908131b6173ace42373eea8a95a3e24706db119eaf3eb096a70e12ecb5a4a135ee599abdf36c53f786bd392a32fdad45438794 WHIRLPOOL 11bc6a0d308513c8e1face57123a0048899788a7307ee75ed0d52508628f08cc64d08a889d1af3ed67f70ef71d3549fbc5ee394d79203286cb690ca61a8f8ee0
 DIST Sphinx-1.5.2.tar.gz 4418646 SHA256 049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722 SHA512 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88 WHIRLPOOL 08fcf21ea37834e52a89f3956df289dc2ffe97e419cc0463815b3f10b95042dae5cf41be74fd1780529d5525ea349c10dd0e0bda6ac24b330ccb21e4a79e22e1
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch b/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch
deleted file mode 100644
index 82609f4afdca..000000000000
--- a/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Georg Brandl <georg@python.org>
-# Date 1351590528 -3600
-# Node ID ffb145b7884fc926d6a68f4aaeede1d4964f727c
-# Parent  2c107bc997e8817c451ba24089766eefb6e60fc3
-Closes #998: fix manpage writer in expectation of docutils 0.10 API change
-
-diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
---- a/sphinx/writers/manpage.py
-+++ b/sphinx/writers/manpage.py
-@@ -72,6 +72,11 @@
-         # since self.append_header() is never called, need to do this here
-         self.body.append(MACRO_DEF)
- 
-+        # Overwrite admonition label translations with our own
-+        for label, translation in admonitionlabels.items():
-+            self.language.labels[label] = self.deunicode(translation)
-+
-+
-     # overwritten -- added quotes around all .TH arguments
-     def header(self):
-         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-@@ -193,12 +198,6 @@
-     def depart_seealso(self, node):
-         self.depart_admonition(node)
- 
--    # overwritten -- use our own label translations
--    def visit_admonition(self, node, name=None):
--        if name:
--            self.body.append('.IP %s\n' %
--                             self.deunicode(admonitionlabels.get(name, name)))
--
-     def visit_productionlist(self, node):
-         self.ensure_eol()
-         names = []
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-python3.patch b/dev-python/sphinx/files/sphinx-1.1.3-python3.patch
deleted file mode 100644
index 4817034eb683..000000000000
--- a/dev-python/sphinx/files/sphinx-1.1.3-python3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User Rob Reilink <r.reilink@science-applied.nl>
-# Date 1331657734 -3600
-# Node ID 8aba132b1337fc351fe1464f3a4b61f21f55e64e
-# Parent  4a6d33249418befdf587603fc31db58fb863fee4
-fixed encoding for hashing functions for Python 3
-
-diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/graphviz.py
---- a/sphinx/ext/graphviz.py	Sat Mar 10 22:24:59 2012 +0100
-+++ b/sphinx/ext/graphviz.py	Tue Mar 13 17:55:34 2012 +0100
-@@ -121,9 +121,11 @@
- 
- def render_dot(self, code, options, format, prefix='graphviz'):
-     """Render graphviz code into a PNG or PDF output file."""
--    hashkey = code.encode('utf-8') + str(options) + \
-+    hashkey = (code + str(options) + \
-               str(self.builder.config.graphviz_dot) + \
-               str(self.builder.config.graphviz_dot_args)
-+              ).encode('utf-8')
-+              
-     fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format)
-     if hasattr(self.builder, 'imgpath'):
-         # HTML
-diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/inheritance_diagram.py
---- a/sphinx/ext/inheritance_diagram.py	Sat Mar 10 22:24:59 2012 +0100
-+++ b/sphinx/ext/inheritance_diagram.py	Tue Mar 13 17:55:34 2012 +0100
-@@ -39,7 +39,7 @@
- import re
- import sys
- import inspect
--import __builtin__
-+import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility
- try:
-     from hashlib import md5
- except ImportError:
-@@ -314,7 +314,8 @@
- 
- 
- def get_graph_hash(node):
--    return md5(node['content'] + str(node['parts'])).hexdigest()[-10:]
-+    encoded = (node['content'] + str(node['parts'])).encode('utf-8')
-+    return md5(encoded).hexdigest()[-10:]
- 
- 
- def html_visit_inheritance_diagram(self, node):
diff --git a/dev-python/sphinx/sphinx-1.1.3-r8.ebuild b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
deleted file mode 100644
index 8d3dfce5aa03..000000000000
--- a/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-# Split the jinja dep to allow different slots to satisfy it
-RDEPEND="
-	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${DEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.patch
-	"${FILESDIR}"/${P}-docutils-manpage.patch
-)
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	cd "${BUILD_DIR}"/lib || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3* ]]; then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.5.1-r2.ebuild b/dev-python/sphinx/sphinx-1.5.1-r2.ebuild
deleted file mode 100644
index a646038ca5de..000000000000
--- a/dev-python/sphinx/sphinx-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/simplejson[${PYTHON_USEDEP}]' pypy)
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'pypy*' 'python2*')
-		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' 'pypy*' 'python2*' python3_4 )
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_searchadapters.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 9837de0a2ece..16d6c8dda698 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,4 @@
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
 DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
-DIST SQLAlchemy-1.0.15.tar.gz 4776213 SHA256 586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a SHA512 12ca4afc8d26a666d721c70399ae30a3c63087265ee0debc10261fd6f1a31b15d5e43c6203da1703f8803c449cf650357d631e12be42fce605311e7acdb2c135 WHIRLPOOL 2ea6f6645fc416f3118adb4d4746f028dcf0e8e9f6c1eb20fb853609fad9a2ab8de5c167b0d9d00dc8de62fd3d244a997b327b55f244172827d44820be646caf
 DIST SQLAlchemy-1.0.17.tar.gz 4787165 SHA256 4352b8ddc625fe648e9e93929fa217c234d7b1a1a2412a3021924b5c2bd95194 SHA512 18fc00bd80d136a65d5ad6929dac97a67514e001baaeaa57e95b31243cfe11aab9ab62ba8f7e68a5e833fbf024507c4908f99277445c8c3c9a3314981567978c WHIRLPOOL 7bfe9479f8cd8290d8065bc62d4ecd6ee1fdc17ada0ebc056ae2a90643a7c8e361b4456f8b93fc9cffa1e72316146975b0fe4f3ce44a8e4f76cb0994fe052a13
-DIST SQLAlchemy-1.1.4.tar.gz 5117489 SHA256 701b57d628b9fa1cfb82f10665e7214d5d2db23251ca6f23b91c5f56fcdbdeb5 SHA512 b4343644ba619c748f6194744fc940360714cc04ef8f11789c62936dcd47a3108c511a2122ba8c4956ba1c92d93e98beb3f3818a8add320c210258f85748f532 WHIRLPOOL 8ab19304c84d702adba52d8864a70a184aab82601384fbfc38bd984fd16a769b637810a1f2436133e2d1eddd9089b31fb27e5953111d819ee476ffdb2b4716a4
 DIST SQLAlchemy-1.1.5.tar.gz 5134252 SHA256 68fb40049690e567ebda7b270176f5abf0d53d9fbd515fec4e43326f601119b6 SHA512 94cfa2a94c21a7f40a34f7bebacf74cafcd8cfc24cabd5a79e0ed28a7a6d0c4182c9ceb076b07e1ee5ca1bd01a38a25ca264bbfdf5344c40e0c59b59582eb043 WHIRLPOOL 2264a5f23e91854d9ad6dcdabc2622658e900be560e7f6f5461357850c445574a982ea81c9ae1b5fb35bea70c419b98f8f3ab6dd4ef1990b9ac647d7f7e80ef5
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.15.ebuild
deleted file mode 100644
index 2c12159a3490..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.15.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.4.ebuild
deleted file mode 100644
index 1e0a6318de86..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 8b829ad899c1..5221657f749b 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,2 +1 @@
-DIST subunit-1.1.0.tar.gz 441946 SHA256 4869a5bec96b7b4e760d053f842d80548008740cda1a7efbb9053063ee818a51 SHA512 11aaa8f2ae04232623fbfb7b9561aa15bddbc55201a3a16eea1319a076de3417977590c57bb7ab0bbd86b321b203241ba5ea8050932759aeb3f3ed71b723a98b WHIRLPOOL 2705fcb98d0b67b5d2cddff87095a9b65782467f3e9b84f956ac29c85c2995881dcd63468a144277fb76b7adfdbbb2ecdc36eae8413886a72028e3565edbdf47
 DIST subunit-1.2.0.tar.gz 460532 SHA256 27f0561297a7d56d85a8f5491f47e44303d0bb1d99c5627486774ea1bcb3d5c3 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c WHIRLPOOL c30b4a2c9ab17f49f87e206fe5833ae564452b99af447f8c4cbf969b2f2dd96e482fc583e84264be815b051b1bd12e6c132cd779c88d0d68da53956fef0b25b7
diff --git a/dev-python/subunit/subunit-1.1.0.ebuild b/dev-python/subunit/subunit-1.1.0.ebuild
deleted file mode 100644
index fcd0955cc055..000000000000
--- a/dev-python/subunit/subunit-1.1.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1 eutils multilib-minimal
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-lang/perl:=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
-	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )"
-
-# Take out rogue & trivial failing tests that exit the suite before it even gets started
-# The removed class in fact works fine in py3 and fails with py2.7 & pupu
-# The setu to restrict this patch is just those 2 is not worth it.
-PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
-
-src_prepare() {
-	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
-	# Install perl modules in vendor_perl, bug 534654.
-	export INSTALLDIRS=vendor
-
-	# needed for perl modules
-	distutils-r1_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
-	local -x PATH="${PWD}/shell/share:${PATH}"
-	local -x PYTHONPATH=python
-	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
-	# DO NOT re-file
-	# test_add_error test_add_error_details test_add_expected_failure
-	# test_add_expected_failure_details test_add_failure test_add_failure
-	# https://bugs.launchpad.net/subunit/+bug/1436686
-
-	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	local targets=(
-		install-include_subunitHEADERS
-		install-pcdataDATA
-		install-exec-local
-		install-libLTLIBRARIES
-	)
-	emake DESTDIR="${D}" "${targets[@]}"
-
-	multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 6359a60cbdfe..3c5f88c10def 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,6 +1,3 @@
 DIST testtools-0.9.36.tar.gz 201717 SHA256 20a1b0d6325f1303ff8112a272047057b73217aac85424aa4065b87641a04499 SHA512 1cb29deb2fb7cd0eebd9affb06e877487989163d0c4452db8051d75b936b0c4ac6443649d52f83cd3695421b361af7dc75507b037528ac0f7cfde9b4b201ad08 WHIRLPOOL 5561c4ef316c31f5c0099beb93eba307328669e43bef36e8da6b1856bf3f75c6b4d81fc0cb777e8397cb246512203c7951c93a52b2a5877e4764cf2e0a749e22
 DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
-DIST testtools-1.8.1.tar.gz 209327 SHA256 155ed29086e48156519e15f7801b702c15ba34d8700d80ba606101f448a3839f SHA512 0bd765bd3cc82a38c980d251427f9f32d44c377aa753d2d83c36fb8cfaeb8a10cfc86a38899b89ff454fe11742ab5e309439980e12a8bbae19b3d9df799803d9 WHIRLPOOL 06f654e447b6ae42cffbff454886dc1016746bf218c90e89c4b9361af2dc709acdfdcd0100c1624dffc1f72dec5c8037dd4357aa373a6413abf945c0d27868e1
-DIST testtools-1.9.0.tar.gz 221760 SHA256 b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644 SHA512 d4d78fb3fd105789e1ee749c66f4612494557af963ba7c3bf5b3c322609bb2ce98c6027f714cbf71720fe248d72a459b554aa65374c6a0b56904b7dabb38a112 WHIRLPOOL 926e738afd86fe945765f9fa08fa40deed7e73db4f37eb2fca9fa30321e28cda9c99e86a1e583853fe1abf93919a71c808131d2cd0694cded3d7203a406fc8d9
-DIST testtools-2.0.0.tar.gz 224923 SHA256 8237ab211cdeced2ff69e7b51c66ed8b1fd2aa0b338b1749609f9567646fad57 SHA512 e27659bc1a21f20de7b8f3699198067e25024dfed68fc9553045a1356a8b46df494882b8946212e11c9cb5a1d4ce8882758839a4accf5bd01db4398ff9e0413d WHIRLPOOL db4daec29b6e1fbe4b9c6989af7f0c70dc70a0d39f84336a9885d1e977cbe0303bf5471342a1d74e0e6a7eb961945d6180153711229dc18e8fdbb9f92b4d6df8
 DIST testtools-2.2.0.tar.gz 230716 SHA256 80f606607a6e4ce4d0e24e5b786562aa42c581906f3c070607a4265f3da65810 SHA512 f5ba08971975aa1ccf923c4c997ca7b093d00615131f440a9a5aad96d63be5b9e72f3364f3185d523fce9b5a7055bd52f767b54f7f9f17a102c4166efec189c5 WHIRLPOOL 042ef9e8177b44b37582b1b8013809b0fd443ac7c57e39317f73e081877c665fd368828e72568b89c0656ebc9d89e82c2ee7ffcd2bf0f31e07573df8573d3313
diff --git a/dev-python/testtools/testtools-1.8.1.ebuild b/dev-python/testtools/testtools-1.8.1.ebuild
deleted file mode 100644
index ad7d7429ed07..000000000000
--- a/dev-python/testtools/testtools-1.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-1.9.0.ebuild b/dev-python/testtools/testtools-1.9.0.ebuild
deleted file mode 100644
index c9055f642a72..000000000000
--- a/dev-python/testtools/testtools-1.9.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-2.0.0.ebuild b/dev-python/testtools/testtools-2.0.0.ebuild
deleted file mode 100644
index 8f254e9834f9..000000000000
--- a/dev-python/testtools/testtools-2.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-PDEPEND="
-	>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index bf5fccfcdfec..7f819aae2aa6 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedConch-13.0.0.tar.bz2 223663 SHA256 7ebbd2ff600a4ee7da3e683b22be4ad97db79ee3b0af0c2758ca3f3788cf9ef2 SHA512 80fc9e2ca1ebd5477964c0de4d0050f1e8ff81ad5f02f836bfa7dd20be487763add83b4df2a038b9cd6066b82cfee2dad932b0f6f7bcbd67428b6babddc3afb0 WHIRLPOOL 2b4b8599f28c0a5980903d0e678a3e05d4bac99a0bc5aa3db6f2fe0bfb3b6336434678f680fc8e3afeb443c470e10e9b08a28dfc7a02cd2ae0a070e7d4258de5
 DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4dae73226429b26bf2983dc7d1df86cc69 SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043 WHIRLPOOL 7ddf201c17f6625cac09197bfc1b532d1f6f8bd01b888668ccb16b5577b235a3379af11e436e0a4ed308218b6fc27e1250841367dc8c191bc420f4a90a7a2a49
-DIST TwistedConch-15.1.0.tar.bz2 222091 SHA256 51dc4d3ab3f13e64a196046e3d722689f87c586f3ebe42e287c2063fdd48bb4c SHA512 912d9a288fcc6bb3e8babee75325ea7a384e364d227f0629bbb5af8c813cff75dbeb38755d2f0eb5bd5ac243c45c4ed5f1c9e01bf0d693b027adeeef59ebd691 WHIRLPOOL 09717988167eaf7ed4ed48262ea344342125deae845b3dce0781a84122446922864d189943011d0be9ddc0711a2236637cb9d6c28e049f5e7c3a59440a65512b
 DIST TwistedConch-15.2.1.tar.bz2 222736 SHA256 77ad3f89fcad8918067e047831c0716a514ff5f9405d6896abf17fd3de05d634 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7 WHIRLPOOL 072a90c66380467354e32af702a0caef71bbd4de469681240e3e91deb74927e5364835d4065a72224433d716763b5eff503adc5205c28a61a07f7ec51c1fb671
diff --git a/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild b/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild
deleted file mode 100644
index 65a2ca05ac74..000000000000
--- a/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted SSHv2 implementation"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
-		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild b/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
deleted file mode 100644
index e28a1ad781cf..000000000000
--- a/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted SSHv2 implementation"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 2ff98c8d607e..6ee7503522be 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedCore-13.0.0.tar.bz2 1495753 SHA256 989706fd39c8a28785bdecaa0145b81f7e159b9209d463b5885be7e5c34ff32f SHA512 624d73d267742cb5b97bed2a39e78caeb01ee5fa871a0a2133455809b1d2a695f0d375c022ae21e91ef20f92fdee05a08a11db7b6b1e92ec810d3e097f929972 WHIRLPOOL 02c25eb94ad0aaafea8e1599df387607c6a1323ac55c31b0e98a366f927da2245fc839f5a3509367ed18690694f8599ebb22c0b21b8c90dfbfe2e3727a7846ff
 DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
-DIST TwistedCore-15.1.0.tar.bz2 1139396 SHA256 c769ecc62d65a33f04f932ec727c367eb557610392e9f7bab37eaf169fb1cebf SHA512 3978429d57b7929bd65103f86d5e150950de48d27382d23a08b97be5c62c218e7cbaa06067ba6c1b926fb372cc290baf5d629af91053cf338e331d996bf8c99a WHIRLPOOL 3baa9a5986e415fee15cbdb33263a9c9ba84a4c7c79a2f744acd28881de2043b56f97137acf5b97d243fe5d6b6885eebaae2b90cced5e81ac4bef5176fd6a1f7
 DIST TwistedCore-15.2.1.tar.bz2 1179442 SHA256 42efb31330e09b5ffdb8caf735fdb925692c6cfdc03ab7ad25104c3dc41154bb SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820 WHIRLPOOL 8abb2522447fd2e9ad0d3d2e3e0cac8e17e07cd80695b95f12fda6af6ccd6576f4b808f322731445667d194c2216669ad3d4d58c0bc5f798449f1d0a35bcc638
diff --git a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
deleted file mode 100644
index ce4282f6be6c..000000000000
--- a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt gtk serial"
-
-DEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
-	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-PATCHES=(
-	# Give a load-sensitive test a better chance of succeeding.
-	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
-
-	# Skip a test if twisted conch is not available
-	# (see Twisted ticket #5703)
-	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
-
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
-	# expected
-
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	# Skip broken tests.
-	sed -e "s/test_buildAllTarballs/_&/" -i twisted/python/test/test_release.py || die "sed failed"
-
-	# http://twistedmatrix.com/trac/ticket/5375
-	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py || die "sed failed"
-
-	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
-	# I currently lack the cycles to track this failure down.
-	rm twisted/scripts/test/test_tap2rpm.py
-
-	# Prevent it from pulling in plugins from already installed twisted packages.
-	rm -f twisted/plugins/__init__.py
-
-	# An empty file doesn't work because the tests check for doc strings in all packages.
-	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	local egg=( Twisted_Core*.egg-info )
-	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
diff --git a/dev-python/twisted-core/twisted-core-15.1.0.ebuild b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
deleted file mode 100644
index 01c63009d39e..000000000000
--- a/dev-python/twisted-core/twisted-core-15.1.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt gtk serial test"
-
-RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}] )
-	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-DEPEND="
-	test? ( ${RDEPEND} )
-"
-RDEPEND+=" !dev-python/twisted"
-
-PATCHES=(
-	# Give a load-sensitive test a better chance of succeeding.
-	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
-
-	# Skip a test if twisted conch is not available
-	# (see Twisted ticket #5703)
-	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
-
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	# Skip broken tests.
-
-	# http://twistedmatrix.com/trac/ticket/5375
-	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
-		|| die "sed failed"
-
-	# Prevent it from pulling in plugins from already installed twisted packages.
-	rm -f twisted/plugins/__init__.py
-
-	# An empty file doesn't work because the tests check for doc strings in all packages.
-	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
-
-	# https://twistedmatrix.com/trac/ticket/6920 6921
-	# Just re-exposing them to list a full list of deficits
-#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
-#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
-
-	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
-	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
-	# Possibly due to over taxing of the distutils_install_for_testing function
-	rm -f twisted/python/test/test_release.py || die
-	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
-	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
-
-	# Requires connection to the network
-	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
-
-	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
-	# Upstream somewhat unreceptive
-	# The last of these invokes a hang or a long delay
-	sed -e 's:test_dataReceivedThrows:_&:' \
-		-e 's:test_resumeProducingThrows:_&:' \
-		-e 's:test_resumeProducingAbortLater:_&:' \
-		-e 's:test_resumeProducingAbort:_&:' \
-		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
-		-i twisted/internet/test/test_tcp.py || die
-	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	local egg=( Twisted_Core*.egg-info )
-	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index 75ae67e88c5c..da73debeee99 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedLore-13.0.0.tar.bz2 87133 SHA256 7874ecb0f79b015fb6183cf181f86ee96469b4e7420c0ff6d1028867d18777cc SHA512 783d5ccba84351f0bacf591d6b3c13765bb9e04bc3e89f217f2d52ff050a79d4b85ef6108bd00f706295928941082bb384e9c6a73171150ffde77d0826f9597e WHIRLPOOL a0550825038429176e36156d8fed4cbca1626afa3228c83cd837d746153acf5490eb1170592af27312abb8e64f380d623aa73af56b05ef1793327b7a2a37a6ef
 DIST TwistedLore-13.2.0.tar.bz2 88616 SHA256 53ca37c533048ddaf209548a21bf3078cb56dce48099251fb6bae107ed9d66df SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6 WHIRLPOOL 380309ec38864a53605e4ab321b61d316f9edfad0696070f958151f66c0775f29b31e75305e94272cbcdb08210f35f0e43d4c717af521b29538ea9aec08b5fd3
-DIST TwistedLore-15.1.0.tar.bz2 54005 SHA256 62e3949683f5ec0cf0ee8160767dff2f5a3cc26c3474bedbafb2e007d5f746b4 SHA512 4a775705083e0fd180df6c2f514f97e79b76e9e6cd8c7ed4c3159ff3a604753dde59f5c780917ff1a136d7db76ed3048606df6c0babc01894746c3e6229f7a67 WHIRLPOOL 97f678887756d6663e22292f63b026fc8611fa017a460d2a11f02f1c60d958433d7bffd99194e93fac40cd2411f4ccbcabe2bef5de88da70440ac4e9e9dad4fe
 DIST TwistedLore-15.2.1.tar.bz2 54070 SHA256 0997d71f84de67fa11662d057ce6e42059fb389fd6bdfb09d8ed6b5df32efe8f SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a WHIRLPOOL e15cdf266975438965fdd4d6d0fd6693d3a3b5281601ac31af8b1aaa6cdea5dea21711ea28f6d2b381123134583f427b904a5a946e465267bccb4c69c7739c54
diff --git a/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild b/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild
deleted file mode 100644
index ab7023f2f841..000000000000
--- a/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted documentation system"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
deleted file mode 100644
index a7d27e5200e0..000000000000
--- a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted documentation system"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index 7604cf75a11d..8faa002c704f 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedMail-13.0.0.tar.bz2 156220 SHA256 ff9c231dc9f1603374363ca7e5cb30c253032f551a02ca8ef74f0d5adcb99b2e SHA512 7d4be4d8bed37743696430aef4a827bdbaf7a5ea094259ef6fc7612955d95f3ef6b10cd08a6af5cf4111608ef93e07701be2f945e507f7c5c62e0997018e5b3f WHIRLPOOL c17423fd13b04a7a8f2a73883407e5b61d07d88dc849b86f44c6220a3f188badb4f0fa2ef9321d121460a1a0203b8c2622bbb4dcfe51257c2d2b161da00e87aa
 DIST TwistedMail-13.2.0.tar.bz2 160046 SHA256 6e4b3844a27bc1f85ae7529bf1c0574f6962c8ca66e08c3c06c2a5a2e39acfc8 SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314 WHIRLPOOL 274f5f60564d94beea5c4a4aa1593de4e602aa7f3fdd6cecfc25ab543d90e177e94b1a73c2857f00f870e3d37b0b427e31f424240fd499ec759ab16ee8797adf
-DIST TwistedMail-15.1.0.tar.bz2 161265 SHA256 fa83f1afc4c2f53321fc2911b64dc923755c0dd8f8f53cee1bbdecb6bcee6474 SHA512 2b5453e83185fa51222e26abf59a743c8cdc872f556c28135a7d7a717cf438f5a9d3ca6085ad4b35ae64509e49130812c3dba4cbe65aacdb738fc903492a1a15 WHIRLPOOL c762acb540f9a3be46788087c434ea8de42660f4ec5a646777d75b66a016d2ebb2fb4f15befa430e7ed01e2e0c7a65f3a47924eda8a6c6afa76febee4fe5391e
 DIST TwistedMail-15.2.1.tar.bz2 161891 SHA256 fc50bee5b5aa95164f5aaf09d29fff3897abb7902db508fa58a004fdeb20d324 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23 WHIRLPOOL 264dc5e931291b7398022d0f3cae0f1af8dc4675b12950adaaa1613a9aa3596c66ec081751bb929be417e29a80e235ccfad9f63893dca66544fe76c65e38568d
diff --git a/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild b/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild
deleted file mode 100644
index f831284f4ee3..000000000000
--- a/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted Mail library, server and client"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
deleted file mode 100644
index c1796b19db35..000000000000
--- a/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted Mail library, server and client"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index 805c65c87e15..15ceba3c40ca 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedNames-13.0.0.tar.bz2 60955 SHA256 831741ec0abaf6fc13469d172152212ab3e8c112b0313c2c0614348e3f32d575 SHA512 37a4f4dc311243d18752cf9f27a0d65a9c6efa9600f59060e4bd62100863d7b14076d1e1fea51a0fdca67a5807803ebf36c262f44ee80ce2bf14ef1e1512639d WHIRLPOOL e99e693b7b0d551ddc45bcac4562d419557730447e0d6767ba6ee42c622a199b63f75855bab0c7d61a4902306cf2776f666effd5d25403a3ed2069ce793e3e7a
 DIST TwistedNames-13.2.0.tar.bz2 71127 SHA256 b8ed07790661eac454ee0bc424f9ede649dec87c11d423421ce2808795e131d5 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5 WHIRLPOOL b6d116781c9dbb408b0eac3fcd7c9ee5259e6d92fd6b7c737168dac14a6534c4f9f684170b6e0103f68703600284da68afb7dfc98f0d0d85117373ae41599053
-DIST TwistedNames-15.1.0.tar.bz2 88684 SHA256 998821c69b8f950264985bcb296340023602d81899a8e3345b055fb05e1f9b28 SHA512 c03141bce0eb26de927d537a896b72823b8dbabde946a3dffd68331c6bb63deab4e7260e07540eb980d31a190c7d5b8224b46dc2e908e8b1aa8c6f869acf745a WHIRLPOOL 768b2d70b00bc12004481dc034dbb437d7fcb21940c590cafe02aab08b68181189967e0c19e46fdebdb776b0ecfaa9b5fa127198ec361554a308e2769557ce29
 DIST TwistedNames-15.2.1.tar.bz2 88688 SHA256 9da80426cd1a1a9951af0adcc54635abda63988761b6f6a92c356916184daf68 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80 WHIRLPOOL 23e38dea7be7a418b5efa38d9b100411d3cf24b0bbe87aa8048b463eac7cccd372b1423f546428392942841f3d7eb6ad900f03ef206ff685de215f0e91182493
diff --git a/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild b/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild
deleted file mode 100644
index 097b111fc82f..000000000000
--- a/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted DNS implementation"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-names/twisted-names-15.1.0.ebuild b/dev-python/twisted-names/twisted-names-15.1.0.ebuild
deleted file mode 100644
index 1abf035420fe..000000000000
--- a/dev-python/twisted-names/twisted-names-15.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted DNS implementation"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
index 01fb9a91e641..08a4b45e1289 100644
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedNews-13.0.0.tar.bz2 19638 SHA256 102f303fee6dc807d53ee281a2a15775a6b04e72e5b7b25ab77fc8faaa96dc3f SHA512 06c9372d5a54b80c6bef0124ad6d34acdb2543739319712f8e46286b284aacfa7c2a5052a6fa17ce4d2d3f5c89f389ce7d274a9f9085b5c21f985b32326e13b7 WHIRLPOOL ae0900a4af7e486b54ed7349ac9f385a511b3a367ef0cf73f3f8225bbe45471b504cef9b494d9e9389ca10e68b79d89a86730e4bf73da8d79ce7247aff61251a
 DIST TwistedNews-13.2.0.tar.bz2 19706 SHA256 e6499fdb79767fd620f8b3dfbf47b356343a92206dfb44833025159d69252f1e SHA512 439f35b882f28be1fa466fabe93c06cd688662a44dd21f58a3c2d9670f95910c038bb30b79c88f661f50be7eb9bb820f6d89a94fbf61bde2d8bb46af574c9274 WHIRLPOOL e989c04b9e89326ddae17ccbaf04e985c51f6dd1e69009b5b899131061f801e8503f9e952063ff1c65d31c04fbd65d418a698ad97b46116ceb4675007c50b112
-DIST TwistedNews-15.1.0.tar.bz2 19843 SHA256 8212888036f10fbae5932dfdbc593047edf08daabff3ba6fa391a8afe1c93186 SHA512 4a1111d0807d95506ad1a44dfd5f49ff72f7e8162e102a2a9945d5ffcc7f58d12f6df65e085f07e47c0fcee4c341bc0b9cdff918e062b450a2a1a0bf974e57f6 WHIRLPOOL 828ef667619d75e7f1d90902d87a462ab409b8925eece72fa0d7b26f857318d229a3b510a9a2625eb694b4b9b47ffe4822d874edda69350b5964b85847c8324b
 DIST TwistedNews-15.2.1.tar.bz2 19889 SHA256 56d5215e0971431dabedf7b5f9a162ae448c8e6d20b6318e627ab9eaeaf1e089 SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342 WHIRLPOOL b0b4836fdc661c6daa663b13a589461a2579177867c0878d261dff7d7628c962b08f9b8cc1dcfa74b49035d473115a4b3dec8f289448502547c2edfbad130758
diff --git a/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild b/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild
deleted file mode 100644
index 84bbf614e35d..000000000000
--- a/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted News is an NNTP server and programming library"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-news/twisted-news-15.1.0.ebuild b/dev-python/twisted-news/twisted-news-15.1.0.ebuild
deleted file mode 100644
index d2f124308b48..000000000000
--- a/dev-python/twisted-news/twisted-news-15.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted News is an NNTP server and programming library"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
index 2dee6b781602..344ae0a928c1 100644
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedPair-13.0.0.tar.bz2 9187 SHA256 3773ea87a89e2cca402dc44015e14af0c8227a61d080f0e8d9deb801a4c04503 SHA512 66d9a51ec1a1a1075ac85aa5f157ffbf4158564ecb68ac74a9d52d72d0c58f70088efb463c4a7e17c187101aebbbc65e947a521661a862a6b6af7ee5aeafefe6 WHIRLPOOL bb6e0d45bb69605002891e2cd060da3aa23549a49426eb0f4422fefe744e17c27ec3e418686c26f7ff721ebb26d0420b0057f24b5660cc062d707773651ea12a
 DIST TwistedPair-13.2.0.tar.bz2 9251 SHA256 600c7dd1e9a4798540c16a7a94585a0e45e938b6f379ff863725bed85c91eb1d SHA512 931b2564e66d5056ce10695e7d9884b55d42c1081feaf9edc011aef9dff21f40e628312a89970f83619611967f155f26f4bbd9d1a325d30670e245e00f47e2d0 WHIRLPOOL 502e096358d0a92051f4b0179bb11d4884d5fac9bf4c4cd3e6b9620fa263f6ee69919c5bc89d7d9a427638e04694f19da529589bda88fa28faba610e8907625b
-DIST TwistedPair-15.1.0.tar.bz2 21712 SHA256 b12521b6668efd001c01f1a2703c64f586a4ebbc388b5aca56bb076795c0762c SHA512 3214017dfd4f62e074d486561ed9c7640d4f43f20fd21b3068427d482bfb3b0b723732b547a5467603b667aa62404e957343ead19a00a0b8a2f0221aa8a4691e WHIRLPOOL 8060d0653dd7e510efc32bc3da2ced56ca9066f0667b2167db455dbaca944982d5cfb2e462eb081415e757b3735bbcf2415ddbf35657ba4e024c0759f45c5987
 DIST TwistedPair-15.2.1.tar.bz2 21755 SHA256 50a95ea152272d98048d10b987805d0aadca5ad3cd9b04580c8bde69bf260583 SHA512 e7e9c8d88ca490c5e9f41ade6aede36dc23ea935f7c1658355bf685e21000e4e20ee1a3ccc3ebdba312fe026a8b7b25f2bcf51c3761668c2c3ce86b37ad3c725 WHIRLPOOL fbfcc763d2fb3b93b369426d7cfcb1bb1309b3720f5fb97193a7ffcdffe67c966b1c2e89ef824df106fe84d5f5d35d934449d0c8a5a73de995c03d7da0e14e65
diff --git a/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild b/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild
deleted file mode 100644
index d5057737aa8d..000000000000
--- a/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted low-level networking"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild b/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
deleted file mode 100644
index 58c8c34256df..000000000000
--- a/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted low-level networking"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-# https://twistedmatrix.com/trac/ticket/7433
-PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
index 393d27197548..17435e117903 100644
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedRunner-13.0.0.tar.bz2 12879 SHA256 f469ebaa364c4fdcdb847b5cd3c614900457d476abaa96612f71a7ae652f56d7 SHA512 332b8ec0650eea8a1bf6a355a54a2ca05138d5859cec3317833369689f92e835ef6c02b7414d680e1019c503b85d87516e590ab23edccd29660880bdc4625c08 WHIRLPOOL 2fdf0a25d721f83aa33839796b1a03cf4303a9c928b7b94d02f03f63c371a650e5ace947c9d6b6142972756e9fe72d3f80745cf1253d973444c0b4e43d434929
 DIST TwistedRunner-13.2.0.tar.bz2 12944 SHA256 0609d2706da8ed0f6e96ca1d94c7dbcb90cd3972d26e1c471df8532a7553e9fb SHA512 1ede91957ecf349164fb63e284896f8909c88e54c032c6c326aabe2efa3058b5b9ba232e5ca60e71776dff4514a6c23483d9720e815f07c48c10232831741489 WHIRLPOOL 1095f5cceb565d1dbdb4232baf4575365d07dde14545eb6779ca9f898cc666724a529aa4531e81ecc367f3ac86b67cae63ff9e692e75e8b6e11d37fce8015942
-DIST TwistedRunner-15.1.0.tar.bz2 13088 SHA256 c28ccd6f8105629c99584e7d9c9a04f90191085bf5e548d15aeb3c226a4c9e24 SHA512 335cb42dc3ecc7708ebb69d79fd2eadfa78d7ef804ad4f6d76660234cff0315aeafbe2a1a7a7e48d994f17ac4403fecb5dc6f987a8a67c9960faca2339afd1c9 WHIRLPOOL 9a735454c03187553deae94c1006b5de74cc3b0382ba2f82b4ab3888b86d520795a996d6a28de9c789a3bc59722dd355c1b1f33161bf31eb7ed3d6a5a2627a56
 DIST TwistedRunner-15.2.1.tar.bz2 13041 SHA256 5890b039f3dea6bdacd86a60de6eac299f96a180f35343d40273c7433afb0894 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867 WHIRLPOOL 020d2b915119b7895479f53b40e55c12e779f937d58633d81a191fc5c0221793f2d51308e5120070ad5acabd4522d33a459a1aa764cb11528acde0ea60049cc8
diff --git a/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild b/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild
deleted file mode 100644
index 92143997d6a9..000000000000
--- a/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild b/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
deleted file mode 100644
index ee8ced798914..000000000000
--- a/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index 279467ff7ee9..d544df325bc1 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedWeb-13.0.0.tar.bz2 395974 SHA256 a3f6b3a47950d96a6da5cf28bf4c1e0bfa894ff2a1c38c38eac4876cac0bdc55 SHA512 d034a63a8d9a52f2db7967e57245a18ff288f1030579204286cc6d4990afe6fa30fb8aa73f62460ecaabaa76c1cc20be75aef0382f5c1bd565bef7923a9c86f8 WHIRLPOOL 93f8eab34be254c7f28aed1c95fcd9963f7038529a3d88ea014d0f2ea996f18955e3a672c89156d379b3fbe15822b21b0be0e7d35bf08bc6b0cf569607f87c0c
 DIST TwistedWeb-13.2.0.tar.bz2 403931 SHA256 aee160e0264d9dbaa0ec0613851128c91e3ac4246d3e9e13a6f2cfdfe7a4904f SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f WHIRLPOOL 9b6d02398cd29e763107338b7b0a2fd60f5ff9ea4d7578d179411c1e6470445621484cb532688d3d72f7634c5a119e52c5df86bfc462de0adf8da1ef875e3bf2
-DIST TwistedWeb-15.1.0.tar.bz2 231028 SHA256 ef55ca0c425f3eed8080003cab080365d7dde038c6554581b4a06aab5a3285ce SHA512 3eccfafa1110b4fa85892fb3c8b0a37514c33c51f1edc6ac41c257dd198fa2f113e82b884dc6af3fa4dc1aefc69e8e6cc3ab1fc19a569c125e608a829c229748 WHIRLPOOL 4783613bfeda1ebd0ead1b4474cff7f3cd6317e7d8752117da99f7f3b340e5ff9d48700a737583a4b6f9d3c6aa7e750d1b45afc4aca32f2792ce802611544d86
 DIST TwistedWeb-15.2.1.tar.bz2 231092 SHA256 fa93a74a264284eb3123bc2481855e83d4901a818b8e4cbb4f7563ca72a12586 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1 WHIRLPOOL 559f56657e5169f477c74e3d8f41b35ad89580ffcee49fca183c9cf9415d89003e9fdaa711e3770848f974f4d4094dac9c4411c05c3aa1582db26bc0ff77a2fa
diff --git a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild b/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild
deleted file mode 100644
index 2a50b21b9c7b..000000000000
--- a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="soap"
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
-		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/twisted-web/twisted-web-15.1.0.ebuild b/dev-python/twisted-web/twisted-web-15.1.0.ebuild
deleted file mode 100644
index d907601c03f1..000000000000
--- a/dev-python/twisted-web/twisted-web-15.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-MY_PN="TwistedWeb"
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="soap"
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
-		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
-# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 1d655b19e19b..eed8eeaf9e64 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,4 +1,2 @@
-DIST TwistedWords-13.0.0.tar.bz2 167286 SHA256 aec3ea773d7a6b3744edaa4206a9d9ce0f20c414c09bc8e53cbc8c96558acbe6 SHA512 5693eaee5dfe2687190e88cb0bc7f13ad7ab8dd1f5c3ac5a2ebf50cfdf667743d7f486d31e53de7d55bc3cfaa7f3e8cab500bd6da0a03a60522b815e4eac1dc5 WHIRLPOOL 021be2c046f05931b65056446b3ffa748e309b5850cfdd5a2d1613ba939b323fe4be8864567d2240d98f26bdf7ac2881956926b38116ae7b43bdff07b144faa8
 DIST TwistedWords-13.2.0.tar.bz2 176411 SHA256 079c4acc179d71058b4c5f802ceda4e3f31eddae1f09b1ab88d1c642fab746af SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105 WHIRLPOOL 6c68fa2faaf5deeb33cffb92f182f45257e13db88251b447f6a0e9690f80621234a8de13d53e976cb141a729763419bff1db55db94e274b836d491545fa1fb2f
-DIST TwistedWords-15.1.0.tar.bz2 166836 SHA256 94863962e5dc339217c2c6dbeb081d78e8976a20bd588f287a23974bf58c1adc SHA512 1b711fea9aabc0d9f3e73e811cabbde41f1e5bdf4573dbe5fcbedb7da480aabe0ed23e006433ad3c425db39277c58804ef408c5d31d2b3e7c2c5564a9a631857 WHIRLPOOL 81e46ef43cf99e99b02348a89aff52d7b96b03180d09e27c9d76cb0887a3ccbfb54541497277d62c196f3cacab2c4b112cf7733df3f8ea5a5605dbb152d45a80
 DIST TwistedWords-15.2.1.tar.bz2 168483 SHA256 ac316d252cc807e0b35728fe8e61d3613e2b52b4991004f896d6faeab63d8189 SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7 WHIRLPOOL d35c2643265ebb3cf9a3f9060b151120476f7f1d8fd2b81618b276d0bcad2e16a1bb7b90589d70d219fee72611db6cfd5f871ef398515e5c20f487d69d6cb849
diff --git a/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild b/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild
deleted file mode 100644
index 3ab879eaa8a5..000000000000
--- a/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Words contains Instant Messaging implementations"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-words/twisted-words-15.1.0.ebuild b/dev-python/twisted-words/twisted-words-15.1.0.ebuild
deleted file mode 100644
index 3cfcc1ef0e48..000000000000
--- a/dev-python/twisted-words/twisted-words-15.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Words contains Instant Messaging implementations"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 19a472c33cea..3f7728f2a58d 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,5 +1,2 @@
-DIST Twisted-16.2.0.tar.bz2 2942537 SHA256 a090e8dc675e97fb20c3bb5f8114ae94169f4e29fd3b3cbede35705fd3cdbd79 SHA512 a1942c15a84946e8bd4833801fffe7be01443560209972e10043262fd17a73c5d0c50592bd037130b6a1de08d7223cbdc1e2398c8c67f559d42e3e8ec81df840 WHIRLPOOL f847d57b833f7fbd9135c4a07af163afaa1e7a821d3aa657b34b2b465540bdce6472682ec20d7f8244117e99a4301e485afe6a765c07b7b64ac9bc90a9592af4
-DIST Twisted-16.3.2.tar.bz2 2916410 SHA256 22c32e68feb6be7ea68bcbc8f89184f06b5693a9f1b59d052927d19597645967 SHA512 6ddca880a06087717487d8a5cc128da81f1acbc97e5c372b1ba51eaeb87390ae7f91925e8e4cc90f29df21692bc11b6e0fe3772341b8488940895e57942e5149 WHIRLPOOL ad381b36f94351c15713e35d6312bae35c78ff90eb485892131f7db8c89168ccf5ddbc9d486bfeb47db695e75280bc73401194c6b36815c5859cc945d0191a7b
-DIST Twisted-16.4.1.tar.bz2 2975697 SHA256 1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816 SHA512 7d841f5ef7fbcc5c215e5fb0d56934c6b37ecb0835a9e602a2b788a76960c669eb910a58c1f40f3e15121a7852a1055d377891c7ce3f2e360292a41341ab6bfe WHIRLPOOL 1c79ea538cddd2026d2aa02367e37f22dec23746f720ce3a25c8065d9db616c622faa89b0011966a27a47f3336fcca066ad85645d3316bbaa318f6143ac8f8cf
 DIST Twisted-16.6.0.tar.bz2 2979747 SHA256 d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf WHIRLPOOL a09a8747312580e3b27d222bf0942b714ad041044a817876e1731c5fa2ae3d11e4d5a45221d2e7d126ebb664730d15c886d5ae164841c7a8f0acd6e12c4691a9
 DIST Twisted-17.1.0.tar.bz2 2997334 SHA256 dbf211d70afe5b4442e3933ff01859533eba9f13d8b3e2e1b97dc2125e2d44dc SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966 WHIRLPOOL 828a939134df47950a285c732867b3d4172e5e86a75fbdc1cc4365b5a24699a0b3fcb573b7e3d389eea591fc9fc79456c09f2d2c8f08d7e1215dc5761e88ed8e
diff --git a/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index 2fe22f1640b1..000000000000
--- a/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- twisted/plugin.py
-+++ twisted/plugin.py
-@@ -174,7 +174,7 @@
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except:
diff --git a/dev-python/twisted/twisted-16.2.0.ebuild b/dev-python/twisted/twisted-16.2.0.ebuild
deleted file mode 100644
index f4e6bdcf9923..000000000000
--- a/dev-python/twisted/twisted-16.2.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5})
-PYTHON_REQ_USE="threads(+)"
-TWISTED_PN="Twisted"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
-
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="conch crypt serial +soap test"
-
-RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	!dev-python/twisted-conch
-	!dev-python/twisted-core
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-web
-	!dev-python/twisted-words
-"
-DEPEND="
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	# Remove some tests known to fail due to the network sandbox
-	rm -R twisted/pair/test/test_*.py || die "rm twisted/pair/test/test_*.py FAILED"
-	# Possibly due to over taxing of the distutils_install_for_testing function
-	rm twisted/python/test/test_release.py || die "rm twisted/python/test/test_release.py FAILED"
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	#local egg=( Twisted_Core*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-pkg_postinst(){
-	einfo "Install complete"
-}
-
-pkg_postrm(){
-	einfo ""
-}
diff --git a/dev-python/twisted/twisted-16.3.2.ebuild b/dev-python/twisted/twisted-16.3.2.ebuild
deleted file mode 100644
index 26b3776bb69a..000000000000
--- a/dev-python/twisted/twisted-16.3.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5})
-PYTHON_REQ_USE="threads(+)"
-TWISTED_PN="Twisted"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="conch crypt http2 serial +soap test"
-
-RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-3.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	# Remove some tests known to fail due to the network sandbox
-	rm -R twisted/pair/test/test_*.py || die "rm twisted/pair/test/test_*.py FAILED"
-	# Possibly due to over taxing of the distutils_install_for_testing function
-	rm twisted/python/test/test_release.py || die "rm twisted/python/test/test_release.py FAILED"
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	#local egg=( Twisted_Core*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-pkg_postrm(){
-	# pre portage-2.3.2 release workaround for bug 595028
-	cd "${HOME}"
-	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
-}
diff --git a/dev-python/twisted/twisted-16.4.1.ebuild b/dev-python/twisted/twisted-16.4.1.ebuild
deleted file mode 100644
index 457429d4e738..000000000000
--- a/dev-python/twisted/twisted-16.4.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6})
-PYTHON_REQ_USE="threads(+)"
-TWISTED_PN="Twisted"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="conch crypt http2 serial +soap test"
-
-RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-3.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-conch
-	!dev-python/twisted-core
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-web
-	!dev-python/twisted-words
-"
-DEPEND="
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-_twisted_prepare_test() {
-	# Remove since this is an upstream distribution test for making releases
-	rm twisted/python/test/test_release.py || die "rm twisted/python/test/test_release.py FAILED"
-
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	# Remove tests known to fail due to the network sandbox
-	rm -R twisted/pair/test/test_*.py || die "rm twisted/pair/test/test_*.py FAILED"
-	sed \
-		-e "s/test_loggingFactoryOpensLogfileAutomatically/_&/" \
-		-i twisted/test/test_policies.py
-	sed \
-		-e "s/testLookupProcNetTcp/_&/" \
-		-i twisted/test/test_ident.py
-
-	# py2.7 only failures... appears to get the wrong form of the correct data
-	# upstream bug: https://twistedmatrix.com/trac/ticket/8872
-	sed \
-		-e "s/test_unicodeErrorMessageTruncated(self)/_&/" \
-		-e "s/test_unicodeError/_&/" \
-		-i twisted/test/test_twistd.py
-
-	# disable due to removing some tests from installation
-	sed \
-		-e "s/test_exist/_&/" \
-		-i twisted/python/test/test_dist3.py
-}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		_twisted_prepare_test
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}"/lib/
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	if ! "${TEST_DIR}"/lib/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	#local egg=( Twisted_Core*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-pkg_postinst() {
-	einfo "Install complete"
-}
-
-pkg_postrm(){
-	# pre portage-2.3.2 release workaround for bug 595028
-	cd "${HOME}"
-	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
-}
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index 6552ecbe7db2..45ea4e7ada8b 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,2 +1 @@
-DIST unittest2-1.0.1.tar.gz 80516 SHA256 ccec0aa70cae02253e6dac861591043f41854b77d7d24dc606dc300769d013c1 SHA512 68e5d6609282e0b2b4134481f25357aaeaa413e83b15695072651db8c3ac32b97fd7f5f329599cb9b0fda29c7e6bd6c5dc83ed12a0a36414912779cfb6bc1899 WHIRLPOOL c4b8c59b7390000916be62c2549d5b9db7c93514166009c5c6f120cd617371f400734a7a3c231903df5fc4817ac10a7572a08b366d3e97a23bc1d7aa456203fa
 DIST unittest2-1.1.0.tar.gz 81432 SHA256 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579 SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa WHIRLPOOL d375c59aed23e4fce14499df2fb64d185facc1e25378805045c66eef9c2fa14de81d7580020300c374f7842d38aaf6ccb26df4ff9a430f6ad497863e2766dc83
diff --git a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
deleted file mode 100644
index c1de837a6349..000000000000
--- a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
-IUSE=""
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/remove-argparse-dependence.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 02a35a1ee526..c18a3d27003f 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,4 +1,3 @@
 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70
 DIST urllib3-1.16.tar.gz 179763 SHA256 63d479478ddfc83bbc11577dc16d47835c5179ac13e550118ca143b62c4bf9ab SHA512 646b35a9a4490b2d1f068883a29cbb5be5050a6eea7bb7842f77cd666b7f88101a7612e8eb45ae0eb900d914518db5202f548ab688b8db1c20ed248ba2edac66 WHIRLPOOL a4a813a5fc560a1487a87e492185122ffe8a41ba263e3c5e5962a48b9f4577a6360fa5d47d474f3c97a56e7ef99b2854c0f742075c05b88461f41d69e10c7a04
-DIST urllib3-1.19.1.tar.gz 187416 SHA256 53bc34c8ee268c3bd83ecf5e9c80fa783f3148484579bd4e20f4a7c1bb2dd6a0 SHA512 a23ce0dec72dd080a355a5dfde1886b7e831314785302d2dbb67db645e25d8a175169a2ed80534657ce0376bd6d38294d4cd479c9142324b179c7607cfe5d13b WHIRLPOOL 2e1b3c71476404a39750c19efd91678398ff3f3bc9f499be3b7af5ba095dac4a2158edaa5b9f4a0906c79cb83d55d77c414715df1beff85a038b148ee7c59674
 DIST urllib3-1.20.tar.gz 201873 SHA256 97ef2b6e2878d84c0126b9f4e608e37a951ca7848e4855a7f7f4437d5c34a72f SHA512 5e2c960ad8641b7e7faf3df966ceb5a2fbb898d9fb4d4459ba607448bab096e3d5df6bc42fdf5fbc2ea58fb6199ba3eb16613b63fd109401d6a2b6e46aade6c3 WHIRLPOOL 30938f71f77e300c9ccc050b6b1f071941db644b5c34ceba262fa839659a7d9655fe22bc867e63edde5dbae790a4505cbea370962cc495700d6b1c6b40c2b98a
diff --git a/dev-python/urllib3/files/urllib3-1.13.1-unbundle.patch b/dev-python/urllib3/files/urllib3-1.13.1-unbundle.patch
deleted file mode 100644
index 76ea5b7b69d1..000000000000
--- a/dev-python/urllib3/files/urllib3-1.13.1-unbundle.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 0a2dac3..b7ad412 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ setup(name='urllib3',
-       url='http://urllib3.readthedocs.org/',
-       license='MIT',
-       packages=['urllib3',
--                'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
-+                'urllib3.packages',
-                 'urllib3.contrib', 'urllib3.util',
-                 ],
-       requires=[],
diff --git a/dev-python/urllib3/urllib3-1.19.1.ebuild b/dev-python/urllib3/urllib3-1.19.1.ebuild
deleted file mode 100644
index 760d25a65978..000000000000
--- a/dev-python/urllib3/urllib3-1.19.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-python_compile_all() {
-	use doc && emake -C docs SPHINXOPTS= html
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	if [[ ${EPYTHON} == python* ]]; then
-		nosetests -v test || die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 9d3be169f061..f678e59811bc 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,3 +1 @@
-DIST verboselogs-1.0.1.tar.gz 4619 SHA256 0a1fa58d6c4bdf7249f04d502cb25c9926f6d1abb834448f27c533728db4d8ac SHA512 51f6509b6e5b5f624c0e21a6f517908a2d4bbb90c3e885488e148731a2f37202bba1de4edf7c1d4ac686b262c172d56f2e8374866d84e4020641fe7ea42e2fbc WHIRLPOOL ea800560ad7ea216e3e54325674836ca7b5258ddec452261b23c1b61d52fdb7088f8ce079ba782e1b0b09c674019393aa081be349f06675da95c607ccbfdcb39
-DIST verboselogs-1.0.2.tar.gz 4784 SHA256 78e8f81a7608417f92b819adf5f66411026f6cf5bcca4102a44c91dcbf60efc8 SHA512 a6a28cf63bd40776783eb33f1877a8e16096820741bdeb4f98b22667196929c98a7dea4a8d3008be75c86d1a6f4d5a635601644fdc9b49a78a45e17a55f589af WHIRLPOOL 73a6f4a3d7c4e5b6a15cf928a6e9c02f48c9f1e0141b44e6f219da5de905b947758c6ff20d0f98e928d0c07759436e1a76a95ce509c594f3c4b5acc44975a8fa
 DIST verboselogs-1.6.tar.gz 8837 SHA256 0967a8a19afaf8e815b8f5060511cd7e172a86c7ecf94838c316baf7b0ee10e1 SHA512 618556820c8585edea5ecf86d4b19800f216764c86eaf796dbdeaa5e2b6ace7940c01e9cf94a499a4619bda8b4b8761def8c6e4200a995da511bb23109dcc7e0 WHIRLPOOL 04c1cec78ce9d3528cc35c36213bc2db628a99b9831c4138b8a1747271979c16fa77c7cc95cd2cac14159e76cdd846361acf6cf80e4d178602f05e3ec0308757
diff --git a/dev-python/verboselogs/verboselogs-1.0.1.ebuild b/dev-python/verboselogs/verboselogs-1.0.1.ebuild
deleted file mode 100644
index e673dc012f42..000000000000
--- a/dev-python/verboselogs/verboselogs-1.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.python.org/pypi/verboselogs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/verboselogs/verboselogs-1.0.2.ebuild b/dev-python/verboselogs/verboselogs-1.0.2.ebuild
deleted file mode 100644
index e673dc012f42..000000000000
--- a/dev-python/verboselogs/verboselogs-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.python.org/pypi/verboselogs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 01b4ea3cc573..3ccc5f6c150b 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,2 +1 @@
-DIST versioneer-0.15.tar.gz 35408 SHA256 1252b9b9420fc3bc01036640da7928fe5d04519f463c5e960eb774c3ea80cd09 SHA512 b9d2f282f5dc681b0dafb0ae34352eb995e16b3184047bc29301b52acde9fc29b49e129c49c767827808a1e524315ece8c8fe02edf18a9d9cd20c34f345336e5 WHIRLPOOL fcc80ffe73bb3733733785587e84b0ab7de39a0916e5070c6cbdf499115e6da51a078f9d8176f4a15305c1b623cd59469385eaeeba33bbcb0116203f7c1704c7
 DIST versioneer-0.16.tar.gz 37736 SHA256 67f9c595eba7479fc5afd867642e21b1a97d2e8cbff9684ad47d41a0db4b3048 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3 WHIRLPOOL 4bd1db6170736ba23e3ce36015f2c096aa17447d2fdebd738d4eca5996df705e17a5b791387a93a663aa8e3ceb120ab96150e9ec1d5f9f3a6650d1f3c21b22f0
diff --git a/dev-python/versioneer/versioneer-0.15.ebuild b/dev-python/versioneer/versioneer-0.15.ebuild
deleted file mode 100644
index 29d31f1b43ed..000000000000
--- a/dev-python/versioneer/versioneer-0.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py make_versioneer
-	git config --global user.email "you@example.com"
-	git config --global user.name "Your Name"
-
-	${PYTHON} test/git/test_git.py -v || die
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 033ccfd7969b..8979565d4378 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
-DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161
-DIST virtualenv-14.0.6.tar.gz 1799312 SHA256 ce61e5d05e3532a8d910663c5ab92ed4c226c3daaba903f1ada281d96fabec98 SHA512 86fae16be973c8a981b106b22fec74909de225b70b7a486108ae769385a573087d64beb8963373f35a444a9baf0a1805c0035313f600655629dd8a03850c51fb WHIRLPOOL f4891ac11d2d2ca889e6b2eea4256c8f8628a59e205a20c022e050e37d3baebde221dcbb02fae7cdeb8d088d1dad30734a1471d37b658b7f13c3895287bc4769
-DIST virtualenv-15.0.3.tar.gz 1847120 SHA256 8b230f01701eee0bfa45a7dc6ff19397abd92c3d50728f08e2236754797fdc01 SHA512 2d7223d59062dae7da8e81ca0463e4dd526faee01b48d2c42e39d7ada328a819e454a96c2380c200dba434f62a7cb1c612eff13815306837f2362bc5e658bae0 WHIRLPOOL c4c4539b44e05f234bd6fdfbb6568159a5b55edfd81e4920dbb4f1606dd8e77f5696c818afa8e1bc4eac28600303a5b2da1418fb3e730c64c7c5489f912d4b68
 DIST virtualenv-15.1.0.tar.gz 1865011 SHA256 aea627d114a3863d6374c5a3fc3cdd08907e0ac951cf93b458e5ba5998c516de SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255 WHIRLPOOL de8dd66fdd004ad9c8e866eaa7bcd701b16b6f7c185ebe73a7681b3600ae4f55996b9f8e321ef51bf85046283a2e4bf948ffe2b10218190ecb334351f92c57b3
diff --git a/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch b/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch
deleted file mode 100644
index 040e36794ba9..000000000000
--- a/dev-python/virtualenv/files/virtualenv-1.8.2-no-versioned-script.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pypa-virtualenv-350c45d/setup.py
-+++ pypa-virtualenv-350c45d/setup.py
-@@ -9,7 +9,6 @@
-         'entry_points': {
-             'console_scripts': [
-                 'virtualenv=virtualenv:main',
--                'virtualenv-%s.%s=virtualenv:main' % sys.version_info[:2]
-             ],
-         },
-         'zip_safe': False,
diff --git a/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch b/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
deleted file mode 100644
index 0e48643a85cc..000000000000
--- a/dev-python/virtualenv/files/virtualenv-13.1.2-PYTHONPATH-backport.patch
+++ /dev/null
@@ -1,144 +0,0 @@
- docs/changes.rst |  3 ++
- virtualenv.py    | 92 +++++++++++++++++++++++++++++---------------------------
- 2 files changed, 50 insertions(+), 45 deletions(-)
-
-diff --git a/docs/changes.rst b/docs/changes.rst
-index 80c3dc1..1d9c1fe 100644
---- a/docs/changes.rst
-+++ b/docs/changes.rst
-@@ -1,6 +1,9 @@
- Release History
- ===============
- 
-+* Remove virtualenv file's path from directory when executing with a new
-+  python. Fixes issue #779, #763 (PR #805)
-+
- 13.1.2 (2015-08-23)
- ~~~~~~~~~~~~~~~~~~~
- 
-diff --git a/virtualenv.py b/virtualenv.py
-index da25205..64e70d4 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -5,9 +5,22 @@
- __version__ = "13.1.2"
- virtualenv_version = __version__  # legacy
- 
--import base64
--import sys
- import os
-+import sys
-+
-+# If we are running in a new interpreter to create a virtualenv,
-+# we do NOT want paths from our existing location interfering with anything,
-+# So we remove this file's directory from sys.path - most likely to be
-+# the previous interpreter's site-packages. Solves #705, #763, #779
-+if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
-+    del_paths = []
-+    for path in sys.path:
-+        if os.path.realpath(os.path.dirname(__file__)) == os.path.realpath(path):
-+            del_paths.append(path)
-+    for path in del_paths:
-+        sys.path.remove(path)
-+
-+import base64
- import codecs
- import optparse
- import re
-@@ -23,6 +36,11 @@ import struct
- import subprocess
- import tarfile
- 
-+try:
-+    import ConfigParser
-+except ImportError:
-+    import configparser as ConfigParser
-+
- if sys.version_info < (2, 6):
-     print('ERROR: %s' % sys.exc_info()[1])
-     print('ERROR: this script requires Python 2.6 or greater.')
-@@ -33,11 +51,6 @@ try:
- except NameError:
-     basestring = str
- 
--try:
--    import ConfigParser
--except ImportError:
--    import configparser as ConfigParser
--
- join = os.path.join
- py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1])
- 
-@@ -1096,45 +1109,34 @@ def change_prefix(filename, dst_prefix):
- 
- def copy_required_modules(dst_prefix, symlink):
-     import imp
--    # If we are running under -p, we need to remove the current
--    # directory from sys.path temporarily here, so that we
--    # definitely get the modules from the site directory of
--    # the interpreter we are running under, not the one
--    # virtualenv.py is installed under (which might lead to py2/py3
--    # incompatibility issues)
--    _prev_sys_path = sys.path
--    if os.environ.get('VIRTUALENV_INTERPRETER_RUNNING'):
--        sys.path = sys.path[1:]
--    try:
--        for modname in REQUIRED_MODULES:
--            if modname in sys.builtin_module_names:
--                logger.info("Ignoring built-in bootstrap module: %s" % modname)
--                continue
--            try:
--                f, filename, _ = imp.find_module(modname)
--            except ImportError:
--                logger.info("Cannot import bootstrap module: %s" % modname)
-+
-+    for modname in REQUIRED_MODULES:
-+        if modname in sys.builtin_module_names:
-+            logger.info("Ignoring built-in bootstrap module: %s" % modname)
-+            continue
-+        try:
-+            f, filename, _ = imp.find_module(modname)
-+        except ImportError:
-+            logger.info("Cannot import bootstrap module: %s" % modname)
-+        else:
-+            if f is not None:
-+                f.close()
-+            # special-case custom readline.so on OS X, but not for pypy:
-+            if modname == 'readline' and sys.platform == 'darwin' and not (
-+                    is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
-+                dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
-+            elif modname == 'readline' and sys.platform == 'win32':
-+                # special-case for Windows, where readline is not a
-+                # standard module, though it may have been installed in
-+                # site-packages by a third-party package
-+                pass
-             else:
--                if f is not None:
--                    f.close()
--                # special-case custom readline.so on OS X, but not for pypy:
--                if modname == 'readline' and sys.platform == 'darwin' and not (
--                        is_pypy or filename.endswith(join('lib-dynload', 'readline.so'))):
--                    dst_filename = join(dst_prefix, 'lib', 'python%s' % sys.version[:3], 'readline.so')
--                elif modname == 'readline' and sys.platform == 'win32':
--                    # special-case for Windows, where readline is not a
--                    # standard module, though it may have been installed in
--                    # site-packages by a third-party package
--                    pass
--                else:
--                    dst_filename = change_prefix(filename, dst_prefix)
--                copyfile(filename, dst_filename, symlink)
--                if filename.endswith('.pyc'):
--                    pyfile = filename[:-1]
--                    if os.path.exists(pyfile):
--                        copyfile(pyfile, dst_filename[:-1], symlink)
--    finally:
--        sys.path = _prev_sys_path
-+                dst_filename = change_prefix(filename, dst_prefix)
-+            copyfile(filename, dst_filename, symlink)
-+            if filename.endswith('.pyc'):
-+                pyfile = filename[:-1]
-+                if os.path.exists(pyfile):
-+                    copyfile(pyfile, dst_filename[:-1], symlink)
- 
- 
- def subst_path(prefix_path, prefix, home_dir):
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
deleted file mode 100644
index 27d0e31afb58..000000000000
--- a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	http://www.virtualenv.org/
-	https://pypi.python.org/pypi/virtualenv
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-	"${FILESDIR}"/${P}-PYTHONPATH-backport.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
deleted file mode 100644
index c97edc4ef1ff..000000000000
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	http://www.virtualenv.org/
-	https://pypi.python.org/pypi/virtualenv
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-14.0.6.ebuild b/dev-python/virtualenv/virtualenv-14.0.6.ebuild
deleted file mode 100644
index 9aa3400b3921..000000000000
--- a/dev-python/virtualenv/virtualenv-14.0.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	http://www.virtualenv.org/
-	https://pypi.python.org/pypi/virtualenv
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-15.0.3.ebuild b/dev-python/virtualenv/virtualenv-15.0.3.ebuild
deleted file mode 100644
index 833483ff7b2b..000000000000
--- a/dev-python/virtualenv/virtualenv-15.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	http://www.virtualenv.org/
-	https://pypi.python.org/pypi/virtualenv
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index e4f220c5f7bf..9fc4ea4a8694 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,4 +1 @@
-DIST pylons_sphinx_theme.tar.gz 607608 SHA256 d892c80fbee8845b79cb41845a89cf2f268893689a68157bc10bd0224948bb9c SHA512 fdafd77e52ff6941de5102bad521ed2a9e28cff6be385cab660a7604be12fa1d86db73fc93f84f72551458cc60b42d3354f27648b1d747b15b25d6f809df8a4d WHIRLPOOL bcf8329b35b90d65eae86a8fc910d074790f912cfe7d4bdd9065970f5c24344e57e585d8dd0b28f101b4ddd4ed0b65caa3bdf7c93fb933ddc6916e63514fa69f
-DIST waitress-0.8.10.tar.gz 123717 SHA256 7c40c1af0f0c254edb25153621a1e825bc1af2f7bf41a74b4bb8ee6d544ef604 SHA512 ba9e418c8cb7094e446b636a98c0d714eacdfd0643f4bd8b99e59cb0f9a56a9538b713482dd830ae5d3ace0381fe75521501ddd979fe5e292645fbf725cf7fe1 WHIRLPOOL 49e55034bdf203aadb07b9c9bce36a1fbd25f45f1cc6da70bd89d5eed8cb6bc1c1cef8b9b82ef21ef9bb724b2eb8c56d004dcba7a8abda98578cb6e3c617589b
-DIST waitress-0.8.9.tar.gz 121048 SHA256 826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a SHA512 e9459b8806389fcdbd6f7cfc4fc908c2076f1fcc306315c5375c872c1a0c43c2537347322f7becf1ad36aec0050dca7b2f713f35318fe3a371e544cc880b7d8c WHIRLPOOL f3ce347d3fa04944ebcf7b6b3734bed0ff1fb1fc1dd9479a10cc4cc77111ae250e2c652dd195b15a86c1c7b740d751d0ca539791f3b97c942737ca0be033a59a
 DIST waitress-1.0.1.tar.gz 123934 SHA256 2daacaece189ede6a23440afe03bda58089a6207f1d80a1e9497f979dfb741fc SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21 WHIRLPOOL 0eca4eec79b894fb561a894f26de1adbe45c70335c66f589d66b26d9c68a708c443eaacded46099d23401390ee45743b8fa2bc39e744f61a988f6695e8c83ea4
diff --git a/dev-python/waitress/files/waitress-0.8.9-doc.patch b/dev-python/waitress/files/waitress-0.8.9-doc.patch
deleted file mode 100644
index f7ff3b01467d..000000000000
--- a/dev-python/waitress/files/waitress-0.8.9-doc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur waitress-0.8.9.orig/docs/conf.py waitress-0.8.9/docs/conf.py
---- docs/conf.py	2014-05-17 05:39:35.000000000 +0800
-+++ docs/conf.py	2014-05-21 13:28:12.921485962 +0800
-@@ -21,24 +21,7 @@
- import pkg_resources
- 
- # Add and use Pylons theme
--if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers
--    from subprocess import call, Popen, PIPE
--
--    p = Popen('which git', shell=True, stdout=PIPE)
--    git = p.stdout.read().strip()
--    cwd = os.getcwd()
--    _themes = os.path.join(cwd, '_themes')
--
--    if not os.path.isdir(_themes):
--        call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git',
--                '_themes'])
--    else:
--        os.chdir(_themes)
--        call([git, 'checkout', 'master'])
--        call([git, 'pull'])
--        os.chdir(cwd)
--
--    sys.path.append(os.path.abspath('_themes'))
-+sys.path.append(os.path.abspath('_themes'))
- 
- # General configuration
- # ---------------------
diff --git a/dev-python/waitress/waitress-0.8.10-r2.ebuild b/dev-python/waitress/waitress-0.8.10-r2.ebuild
deleted file mode 100644
index 685060d37816..000000000000
--- a/dev-python/waitress/waitress-0.8.10-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/waitress/waitress-0.8.9.ebuild b/dev-python/waitress/waitress-0.8.9.ebuild
deleted file mode 100644
index 3130ebe13942..000000000000
--- a/dev-python/waitress/waitress-0.8.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz \
-		doc? ( https://dev.gentoo.org/~idella4/pylons_sphinx_theme.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	if use doc; then
-		local PATCHES=( "${FILESDIR}"/${P}-doc.patch )
-		mv "${WORKDIR}"/_themes ./docs/ || die
-	fi
-
-	# Fix generation of documentation with Waitress not installed. Bug #525384
-	sed -e "s/^version = pkg_resources.get_distribution('waitress').version$/version = '${PV}'/" -i docs/conf.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 2418c3f07a63..1dce7a704f05 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,7 +1,2 @@
-DIST WebOb-1.4.1.tar.gz 671495 SHA256 12f8b98390befc47336d2c0e5bad9cc48609d808eabb3f8675dc1027a3a9e9db SHA512 71be0389018289884158c5f3b99d1e1185bd29ab975ea59008fd71bf1188d25130e1852422dcedf7ffe3303d87caf02d62a143229b9ae196dd62f64deb7f7328 WHIRLPOOL d2803552592813c4b5ea4291e9a3aac6aa26397b903a8372f8e1fd601d46fb5f7105dcfd42e14de974a352e75945bf61945e0f36928d6a3fd8afa8bdd195d35b
 DIST WebOb-1.4.tar.gz 633302 SHA256 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399 SHA512 0cf1a21b7d863c355e445f0e9f898ffb1c4c39099532a86d830c1be5d84efc0c6f3e8151a283cfd1cb5bebcb1fe78a2b6b269cbc130863679a017565a2539a37 WHIRLPOOL abfc696b7f50a74edd3d84099365f802f5be0eddf56a1c128f6e026c30bdeddc1b58c6bb45d4281ee4fb3d7937888d8065b01f93a363c82cd9cd1834eb2378da
-DIST WebOb-1.5.0.tar.gz 186394 SHA256 8e90cca008c0189fe64d06281d50d9510c1dde4147bdf4bc81b666020ce31350 SHA512 4d5a4f58eb3f96d4b563c0a8d8387f30ad323d11c3a913ba69504685e7baa870f232d55e6d8b403e3f6b2153c3c7f37a694618bf0e85d04115c240c5fa2b93b6 WHIRLPOOL f3f6975f84bc64fe941fd3d3c5cd065cfea8e59b2f0481e31c7bf5145934d038420ccb93df918e5e729607ee75bb77d3a8142c4ff4ac60b2be14212061a1fa3a
-DIST WebOb-1.5.1.tar.gz 202821 SHA256 d8a9a153577f74b275dfd441ee2de4910eb2c1228d94186285684327e3877009 SHA512 aba45ff622a572a3bda7cf33ce5988745b3831aea2ed7f0502688055f96c16cf5de828039439218611034ad49dea4e4a9c2ec43b8dbc97be61b7abc33a15589c WHIRLPOOL 814e11b257f82a48f9ed8ff1e1ecb37ab0648c7f67446aa57094da671f0265fadd7b04e9e69ed1ecbfbbc1925804ef7f563f8079b82bea04d8a06853482960b7
-DIST WebOb-1.6.0.tar.gz 204340 SHA256 63d262d8f61b516321f786879c9277fa2209f7f57eb47b537eeecfea383d55b7 SHA512 a4805ea7b30d5afd64d4d2c053fd8b9d71ec9409270e85af4e071352e933474b52eb3493a52f3b29ff0040a4d6fc41dc1b70fe35ffbb209b36e9e3bca3ec75c6 WHIRLPOOL 634245c5f30ec7581e17166d89a4441e3b67d29c23a4bf7345e40ce2ba4bc3eed2d287135c9fa8b6833734c237869d76f8da804600d3633106e35cd7648db78f
-DIST WebOb-1.6.1.tar.gz 204676 SHA256 e804c583bd0fb947bd7c03d296942b38b985cf1da4fd82bf879994d29edb21fe SHA512 da760fb67d1962b3fd8ff421ef6d34cc377406d82bfe053244c53a4bddfcef5433b0816d8d11a164e1a71e5562ae56cde3090fb74de414c41ba3777b89c64631 WHIRLPOOL d8c9126ad6ea43e6be35ff012754e7130f0c975b8284de4d6d2874131d47a76cf053945d35f0bab27a413fe020c3d1356ffee91c6d1d9a1c5697d64fdc2aab05
 DIST WebOb-1.6.3.tar.gz 206375 SHA256 1b03115e162dd0102f6147c5d5ed71a3a2ba0f58ef829244b64f52fe6dbf5888 SHA512 41830571ca4e0727b2bb2c6ad81f36f2d07a2018c2a01e00acb2e32ef7c503e133653cb62f1ddcda3bf10f44ff3215cc2e2b53e7544b867ddf3f50fa9b4ca79b WHIRLPOOL 2bd99bbc0dece593c899aa962b8bfe7d35cd908fdc8723997cfd61250d6ac73b85c8d48a0b78fd162f591e941f8dfb74a7d21a11f12c750cb5f06d2736a64504
diff --git a/dev-python/webob/webob-1.4.1.ebuild b/dev-python/webob/webob-1.4.1.ebuild
deleted file mode 100644
index 89fd2c14184e..000000000000
--- a/dev-python/webob/webob-1.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.5.0.ebuild b/dev-python/webob/webob-1.5.0.ebuild
deleted file mode 100644
index fd6f6e2048c8..000000000000
--- a/dev-python/webob/webob-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.5.1.ebuild b/dev-python/webob/webob-1.5.1.ebuild
deleted file mode 100644
index 660c9edd88fd..000000000000
--- a/dev-python/webob/webob-1.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.6.0.ebuild b/dev-python/webob/webob-1.6.0.ebuild
deleted file mode 100644
index 06e85d686a51..000000000000
--- a/dev-python/webob/webob-1.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1 versionator
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.6.1.ebuild b/dev-python/webob/webob-1.6.1.ebuild
deleted file mode 100644
index c190fa386a95..000000000000
--- a/dev-python/webob/webob-1.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1 versionator
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index af9550e75372..ed27da960eea 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,5 +1,2 @@
-DIST WebTest-1.4.3.zip 80008 SHA256 0439d951afdf6c58d19e0a83e30855d0bb7e35ab177d9261add71fc5a724b6ab SHA512 87436f182edc3178481f4ec3d073399784e353d6480790470891a18d3605c2bb5a1f4effe0ffa0ce241f1256e99f1a4e3e5fcd2896acb8931aeb60a88fa2bfa2 WHIRLPOOL e509a71a213b9085473536afb51142c4cd9fe99b52870139498fe5b68e8326e8b23df9af3502f0d3ebffbe0076165564d38ef143d9b229bb94b23bb857ca6fe9
 DIST WebTest-2.0.16.zip 88232 SHA256 24ad0c9ee377f16df4d0bd626a64a75eec901852ac788bdb70e0261bff0026eb SHA512 da09abba8ed52c8d673acf547f47df6919b534b33b746944610fc78bd3695f36e3718f89e68f8aec7852b6cf98da0f0b5500dfe9427fd7926e5304ad216eafbb WHIRLPOOL 68d392000c8767ef9b5d4cc657bd6e99ec75eb4cb20cacdabdcca87942894b290f957854fb7dfb7c9eb8312877575c4e4d258e78c05f985e972b02ee04ec2643
-DIST WebTest-2.0.17.zip 88435 SHA256 36457f708a57e4295a2c05aaf47b620b66e25429dd9170c59d0718ff7934a0b7 SHA512 5a1e26108af1cb5fc5db10bf10a48c98815ccacb84c692ecedfc6ef02427bedaa3bdfc466a89faa51c82474da2bd393aae5f17821c516966999c5d2e5f12628d WHIRLPOOL 2c7c504fd6087cc116f28de8113f456901535d6d098845bc1b3551264ee9ea5c7bc9fad4699015eecb974a0423edf60e0715d93025ed3d05da91a6235dc6e1fb
-DIST WebTest-2.0.18.zip 88440 SHA256 beb569e6d707cb4cd82c226c97b7e1f41cd62bae656d89e687107eef8376c7fd SHA512 98f61325a2cb0db3c0aec317f3acf8a741531fece33fa359615cdee8738cb2c4523156971c1fd420c900b0d3ece4adc15f2e77975f40376f0e58370ff7b5fe79 WHIRLPOOL 5057d1c1518656f4869a6baa41617815972044b91b2dbc8d56b2adcb379fefcf01de57b90cd7ee98664c004619f2170d5a6f0fd9a175a83ef758af0ee7d5c48c
 DIST WebTest-2.0.21.tar.gz 66866 SHA256 3dc92ecd7604e21fc7c97578e4c43aff2a67cebdd4884a2aa804d85e85b34b55 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610 WHIRLPOOL f87c877dc30dcee5c86225849d27a1a3b5504f656e4c68ff88273c665f1684cb21f0e31ebcdd4b6981e1bc5269d8057379f78d90c708de8e319846a5aa27669d
diff --git a/dev-python/webtest/files/webtest-1.4.3-doctest.patch b/dev-python/webtest/files/webtest-1.4.3-doctest.patch
deleted file mode 100644
index 15b65c517079..000000000000
--- a/dev-python/webtest/files/webtest-1.4.3-doctest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This doctest relies on dictionary key order, so remove it.
---- a/docs/index.txt
-+++ b/docs/index.txt
-@@ -321,11 +321,6 @@
-     <Element html at ...>
-     >>> res.lxml.xpath('//body/div')[0].text
-     'hey!'
--    >>> res = TestResponse(content_type='application/json',
--    ...                    body=b'{"a":1,"b":2}')
--    >>> res.request = TestRequest.blank('/')
--    >>> list(res.json.values())
--    [1, 2]
-     >>> res = TestResponse(content_type='application/xml',
-     ...                    body=b'<xml><message>hey!</message></xml>')
-     >>> res.request = TestRequest.blank('/')
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
deleted file mode 100644
index c7b2abe02523..000000000000
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-python/webob-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/webtest-1.4.3-doctest.patch" )
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	# Tests raise ImportErrors with our default PYTHONPATH.
-	unset PYTHONPATH
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if [[ ${EPYTHON} == python3* ]]; then
-		rm -f "${D}$(python_get_sitedir)"/webtest/lint3.py
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webtest/webtest-2.0.17.ebuild b/dev-python/webtest/webtest-2.0.17.ebuild
deleted file mode 100644
index 69eb318778ba..000000000000
--- a/dev-python/webtest/webtest-2.0.17.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-
-# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makes testing easier; otherwise we get errors from pkg_resources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	# Tests raise ImportErrors with our default PYTHONPATH.
-	local -x PYTHONPATH=
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webtest/webtest-2.0.18.ebuild b/dev-python/webtest/webtest-2.0.18.ebuild
deleted file mode 100644
index 2fadbc674f01..000000000000
--- a/dev-python/webtest/webtest-2.0.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-
-# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makes testing easier; otherwise we get errors from pkg_resources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	# Tests raise ImportErrors with our default PYTHONPATH.
-	local -x PYTHONPATH=
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 1e6e7e8b4774..abab904b88fa 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,3 +1,2 @@
 DIST Whoosh-2.6.0.zip 1193541 SHA256 7de7bc4d00a6d051dbb360b48eb7f3cd002373d87252fb0b284a3c9c453a7677 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37 WHIRLPOOL c42e9760833db7186f3df5946f6dd071288cfccf2eaefba95520a2415ca377c49cf74307b3fa2c9e655f134b086ae637e5db06330248b4a27e12175920f3c7b8
-DIST Whoosh-2.7.3.zip 1097515 SHA256 aa6db447522e208ae652c6ce063bb23cedec47f5ed630121b3debaa011fcb9c4 SHA512 3df18ed30f63aaa9f858d596919fa8a927f7203a52bdb4c584117b28bce313cbbb530cdb144e35af99763edbbc7d3f5c79680d04fa7c04efa91376ba62b6f556 WHIRLPOOL 1829fd083485367dd0751844c77e5f7e8c8edee4021b8518415ab6cd6f8db84b5f2f188d6e2128a105cfd8076d8101c1421838ac18f10cd632c64eed5828a44e
 DIST Whoosh-2.7.4.tar.gz 968741 SHA256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074 WHIRLPOOL 2f077eb84fc89ff03babdd7adb25bf04ca03811a21f9ac987854c158fdd0b31f25d30ad59c9299a2da4b7ed982e2d292eeab781c10c9062e878ac0f8454115ed
diff --git a/dev-python/whoosh/whoosh-2.7.3.ebuild b/dev-python/whoosh/whoosh-2.7.3.ebuild
deleted file mode 100644
index f75fd4897278..000000000000
--- a/dev-python/whoosh/whoosh-2.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-MY_PN="Whoosh"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
-SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# (backport from upstream)
-	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
-
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://bitbucket.org/mchaput/whoosh/issue/403/
-	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html
-}
-
-python_test() {
-	# https://bitbucket.org/mchaput/whoosh/issue/412/tarball-of-whoosh-270-pypi-missing-english
-	# tarball missing a file english-words.10.gz which when added sees all tests pass.
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( README.txt )
-	use doc && local HTML_DOCS=( docs/source/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 8a22ee1d3f79..405577f400cc 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,2 @@
 DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c
-DIST wrapt-1.10.6-r1.tar.gz 120259 SHA256 b540e23753d3f7017ec0d38f16daf77f9e9cf170d5040abc3d87573ba20fc4f3 SHA512 658c780971dddf444070b9d30a8ac7c08ee0088b8f4378bcc9c22126608e52b338dc00969b08828b0318070abcf0e875bc2b7c6228a71fbbca362033088b4314 WHIRLPOOL 7aed77677a1448d6b3795be7fb56989be98a691a7470096adf45002ca124a99b5cab3e42b319493b4c8300684e488a07cf96d1c5a01e9fc9f181f765a0542254
-DIST wrapt-1.10.7.tar.gz 120316 SHA256 50ad31f01761410b192ce054aebcb61c54dbd493446440214356635874ecafca SHA512 ca694963860e22d6fe05fdd679f25c7d2fb01a3a635f9744dd2034c7468563f299442a3a60f4385e049b15f04bc86c7c0a6d0501bf274a87cdcd786fd46efeee WHIRLPOOL 659226504f1711749dae0228a9de07bebd04d2c4dd4b8696095eb7e76c6e1a7e991ea5a08188d93abe14c8a7e9b69b0d4ea04945fcf8349dd1f397870e39cab1
 DIST wrapt-1.10.8.tar.gz 120359 SHA256 096b47f44e3197934ccc335c53d2d21bf6ed9fd941b294726e26a1fd18fd4541 SHA512 2a37584b3c3a33a2d39d5cbe9f7e61a50131db55ffd5be7902b5ee84c347d8ff4d6094e5639d2f854fab274b2517a0e47420da9f543f11cf92973acd6d15d42e WHIRLPOOL 5f27b048b9f06c03c3e3acdd9c3a64308958585deb7e314c80158910cfc1eac154540a0e4a3c838718456d5ed38751d85f49645e634a7d2734cad916547a5bc7
diff --git a/dev-python/wrapt/wrapt-1.10.6-r1.ebuild b/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
deleted file mode 100644
index e7bb3e8370e9..000000000000
--- a/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
-S="${S}-r1"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	py.test -vv || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wrapt/wrapt-1.10.7.ebuild b/dev-python/wrapt/wrapt-1.10.7.ebuild
deleted file mode 100644
index 80343e195bfa..000000000000
--- a/dev-python/wrapt/wrapt-1.10.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	py.test -vv || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 65b69ca2e91e..d85b0ad02f5c 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,10 +1,6 @@
 DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
-DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae
-DIST wxPython-demo-3.0.1.1.tar.bz2 3991248 SHA256 bb264db3369c7228f0356f1ad64f6a9ca3000b167bc1ce3fee94d3d2fa20d069 SHA512 b75ca80b5a247f5c97691c4c77c36d64ebe82d94803cd8d687b2110e9de290067c7da893797ae13d0a9f42a4da83170b630dcdeb9460657355c43005dfeac89a WHIRLPOOL 3db15c676252f4f96b585271d0ef005b84cbb4538f01db53e18c587b33fdfc5b57da40d9ba2f2c467063de79c81ed6440982fe5e21547a21fbe2d7d4e252f69c
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1
 DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89
 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
-DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
-DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
diff --git a/dev-python/wxpython/wxpython-3.0.0.0.ebuild b/dev-python/wxpython/wxpython-3.0.0.0.ebuild
deleted file mode 100644
index 9cab20f1aedb..000000000000
--- a/dev-python/wxpython/wxpython-3.0.0.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="3.0"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
-	mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo examples libnotify opengl"
-
-RDEPEND="
-	dev-lang/python-exec:2[${PYTHON_USEDEP}]
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
-	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	cd "${S}"
-	local PATCHES=(
-		"${FILESDIR}"/${P}-wxversion-scripts.patch
-		# drop editra - we have it as a separate package now
-		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-		# fix handling egg_info command
-		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	mydistutilsargs=(
-		WX_CONFIG="${WX_CONFIG}"
-		WXPORT=gtk2
-		UNICODE=1
-		BUILD_GLCANVAS=$(usex opengl 1 0)
-	)
-}
-
-python_compile() {
-	# We need to have separate libdirs due to hackery, bug #455332.
-	distutils-r1_python_compile \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
-	distutils-r1_python_install \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-
-	# adjust the filenames for wxPython slots.
-	local file
-	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
-	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
-	for file in *; do
-		mv "${file}" "${file}-${SLOT}" || die
-
-		# wrappers are common to all impls, so a parallel run may
-		# move it for us. ln+rm is more failure-proof.
-		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
-		rm -f "${ED}usr/bin/${file}"
-	done
-}
-
-python_install_all() {
-	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	if use examples; then
-		docinto demo
-		dodoc -r "${DOC_S}"/demo/.
-		docinto samples
-		dodoc -r "${DOC_S}"/samples/.
-
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-
-		docompress -x /usr/share/doc/${PF}/{demo,samples}
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl create_symlinks
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "it with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	if use examples; then
-		echo
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		echo
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-
-	update_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl update_symlinks
-}
diff --git a/dev-python/wxpython/wxpython-3.0.1.1.ebuild b/dev-python/wxpython/wxpython-3.0.1.1.ebuild
deleted file mode 100644
index 240555788291..000000000000
--- a/dev-python/wxpython/wxpython-3.0.1.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="3.0"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
-	mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo examples libnotify opengl"
-
-RDEPEND="
-	dev-lang/python-exec:2[${PYTHON_USEDEP}]
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
-	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	cd "${S}"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
-		# drop editra - we have it as a separate package now
-		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-		# fix handling egg_info command
-		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	mydistutilsargs=(
-		WX_CONFIG="${WX_CONFIG}"
-		WXPORT=gtk2
-		UNICODE=1
-		BUILD_GLCANVAS=$(usex opengl 1 0)
-	)
-}
-
-python_compile() {
-	# We need to have separate libdirs due to hackery, bug #455332.
-	distutils-r1_python_compile \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
-	distutils-r1_python_install \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-
-	# adjust the filenames for wxPython slots.
-	local file
-	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
-	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
-	for file in *; do
-		mv "${file}" "${file}-${SLOT}" || die
-
-		# wrappers are common to all impls, so a parallel run may
-		# move it for us. ln+rm is more failure-proof.
-		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
-		rm -f "${ED}usr/bin/${file}"
-	done
-}
-
-python_install_all() {
-	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	if use examples; then
-		docinto demo
-		dodoc -r "${DOC_S}"/demo/.
-		docinto samples
-		dodoc -r "${DOC_S}"/samples/.
-
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-
-		docompress -x /usr/share/doc/${PF}/{demo,samples}
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl create_symlinks
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "it with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	if use examples; then
-		echo
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		echo
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-
-	update_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl update_symlinks
-}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 0e7e9d9fe412..fd242759a0c4 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,3 +1 @@
-DIST zope.event-4.0.3.tar.gz 390984 SHA256 f5fdf6ca5716f714023358b212f7f435539dea11771603cd90eebf3ad34405f1 SHA512 bc328bb588beea0cdf55d5f36ff5b269d7b75f399b6d595e1df6565bf1d1fbe2d65b63072db26d096a3fc2dfc0fcec747ea7cf8eabe3c4535084347cb149f1e7 WHIRLPOOL 58ce4490fa86c79b30edc3c96d8d9e912b5d692bffe9664a29d2a7963efb90bb6d03acbe0774eb03ac912acfe44cca1c126cc1a840538bd2abcb1848ec972b53
-DIST zope.event-4.1.0.tar.gz 476047 SHA256 dc7a59a2fd91730d3793131a5d261b29e93ec4e2a97f1bc487ce8defee2fe786 SHA512 abb0a2de578546f678eb06160b50e6c301de97d4248baed80cd76cbf666b22962052f82d8a58a3006e72d288866e5d5baec86425ab27a79926b4706ef8d5915e WHIRLPOOL 9f07da6353636371df83e6fbb6d197d14959338ace4565ba1429d8759a26c3894a27e3fdaacecf2760c709a1baecc2128cd4c5430284ac7453dc8898e79d1f68
 DIST zope.event-4.2.0.tar.gz 488532 SHA256 ce11004217863a4827ea1a67a31730bddab9073832bdb3b9be85869259118758 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989 WHIRLPOOL adcf773453096493ef6740480dd6b9b2f62a48670767896b25dd168fe6406f9b160a1ffd71baa93a29a085805ffffb2baf3158e955850199b90821a782fe39e0
diff --git a/dev-python/zope-event/zope-event-4.0.3.ebuild b/dev-python/zope-event/zope-event-4.0.3.ebuild
deleted file mode 100644
index 346538f7882e..000000000000
--- a/dev-python/zope-event/zope-event-4.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-inherit distutils-r1
-MY_PN=zope.event
-
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/zope-event/zope-event-4.1.0.ebuild b/dev-python/zope-event/zope-event-4.1.0.ebuild
deleted file mode 100644
index 11665454aa5e..000000000000
--- a/dev-python/zope-event/zope-event-4.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-inherit distutils-r1
-MY_PN=zope.event
-
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 81efbb0c9a3e..ff6944e5be7d 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,6 +1,3 @@
 DIST zope.interface-4.1.1.tar.gz 864139 SHA256 91cba7b7cd7cb82f6f4e023fe77f94dc3df4ae5287fd55def2148dc232d0c7da SHA512 77d8c978522e95063bb5a1feb5b20af341bcf447d393ceb1ea229f0db02408f0e8981226621c04988936730b265cdba0bab88aaacd7fdf1006281c297e8e1ca1 WHIRLPOOL 5ba337bcd3eb5c55cdb78ddbbd9843eb04c7b36c31819be4359849bc8cd453514fca38aa05fd78090cca80061b373e26d7a7cee1230fbf888c74f202b179c4b2
-DIST zope.interface-4.1.3.tar.gz 141561 SHA256 2e221a9eec7ccc58889a278ea13dcfed5ef939d80b07819a9a8b3cb1c681484f SHA512 4579b7f3f5ae9cde83fcba24147f7480172015d3ec7480e4fac40d06f7846cf4fd1da966fc3e5c12c3f7058762052ef33d0535c685b120c1370d09d2274780e2 WHIRLPOOL 41b9eef46f581455346ed254aa73c2a2cb5dea0c27f506412fe90c66eaebeaa4fdb88d58e7ba4a0e9a7beb22df3f7d9039fcaac1961fe06fb9684f8f8509a243
-DIST zope.interface-4.2.0.tar.gz 146335 SHA256 36762743940a075283e1fb22a2ec9e8231871dace2aa00599511ddc4edf0f8f9 SHA512 737d6e3af994a630d3de0dbfabc4f2e578cf943466bf1411358c0421db81e6f98067900e3878eb5f3f48922fb60754c56368d70d12aa65c7c8bcadc42a8402fd WHIRLPOOL a6ef6eb5b1cabbbe126f5b7438ca8bfc8d1aff1f34cb4f75da68db117037c85cafed47fc19a7720b2ba67a6c296e538a44aeddc2684bb9b0fa90f09f431ab161
 DIST zope.interface-4.3.2.tar.gz 143139 SHA256 6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251 WHIRLPOOL f7382ca23cd3c9c6cc26154a1414306fc969fa65f242654c9e4f8aa3c821bf68bbad11476a8744908bb34884c74d8e4f5e4826c0a25788a34d78c9c8dd4538c8
-DIST zope.interface-4.3.3.tar.gz 150572 SHA256 8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88 SHA512 5459d8122b8028b3bc79ec6964aa3e13a36a2aa10418c06008c80a77abe8e853cb9cb11ca5213bdcaa15649d435bf6550a0b7beba9f454dfc22d840eba752bc6 WHIRLPOOL 2018443dbdcaa3403b45013a780b30da16da4427d055723ded6880da73ce36e5752828ebf154734b2eee4afaa5b6b4a69006856995980e005065073b5f3d4b30
 DIST zope.interface-4.4.0.tar.gz 151322 SHA256 e50e5e87cde9bf0ed59229fd372390c2d68b3674ae313858ef544d32051e2cd3 SHA512 82a08237f8467407304d7e7f6932e4e4fe051413f2d83ff34bc4621fe272ad223b8e62ea9ee3bebc559ce719ee20e6fd084b187a8e688fc01d8beff6dc037756 WHIRLPOOL 4b0b12e681a09285bc9efa14ba5f5ede82ff3941c12798e17445e4fa789a6ee2c571a79e5f5623f0eea07b80eba61d28c23935548b2dd67b93e322ac2794ea0a
diff --git a/dev-python/zope-interface/zope-interface-4.1.3.ebuild b/dev-python/zope-interface/zope-interface-4.1.3.ebuild
deleted file mode 100644
index 6bd0f37b6c47..000000000000
--- a/dev-python/zope-interface/zope-interface-4.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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=""
-
-S=${WORKDIR}/${MY_P}
-
-# until all deps are in the tree (bug #442794)
-RESTRICT="test"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/zope-interface/zope-interface-4.2.0.ebuild b/dev-python/zope-interface/zope-interface-4.2.0.ebuild
deleted file mode 100644
index 8a7d3bda2441..000000000000
--- a/dev-python/zope-interface/zope-interface-4.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/zope-interface/zope-interface-4.3.3.ebuild b/dev-python/zope-interface/zope-interface-4.3.3.ebuild
deleted file mode 100644
index de8318de9bad..000000000000
--- a/dev-python/zope-interface/zope-interface-4.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
new file mode 100644
index 000000000000..4a84d94ce87b
--- /dev/null
+++ b/dev-ruby/erubi/Manifest
@@ -0,0 +1 @@
+DIST erubi-1.6.0.gem 12288 SHA256 3d5c1d19390f201a209e5d01a3c41bee253c0b0afa508ee872b979ee3c778a0f SHA512 33da5ab621f505aaa2203e156f7071400a516cff845c405eb30f2fdd2d1ffad2109ff369a878bfb701e884de54d9b4b5ee13d4fb65d822ad35d4c0d192709f8c WHIRLPOOL b78471e1531414971364bcb30976bd3994f16577e47056824b4c0c7f933d6d4bf141b76a263a69fa8dad99b9b782f65a92e198ffc7ae50f787e51feaf30cad9c
diff --git a/dev-ruby/erubi/erubi-1.6.0.ebuild b/dev-ruby/erubi/erubi-1.6.0.ebuild
new file mode 100644
index 000000000000..763220b780e6
--- /dev/null
+++ b/dev-ruby/erubi/erubi-1.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
+HOMEPAGE="https://github.com/jeremyevans/erubi"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/erubi/metadata.xml b/dev-ruby/erubi/metadata.xml
new file mode 100644
index 000000000000..23b9745782d1
--- /dev/null
+++ b/dev-ruby/erubi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jeremyevans/erubi</remote-id>
+    <remote-id type="rubygems">erubi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index b0c1c2d64c6e..1964906e0c9a 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -3,3 +3,4 @@ DIST gherkin-2.12.2-git.tgz 1764938 SHA256 139739eae42c7da925c816c859a41dcf539a3
 DIST gherkin-3.2.0.gem 30208 SHA256 712404a266c65f6679afcf09978c048a2eee955010de276538f6078f7a8ead14 SHA512 28bccdb94e80945d2f435d15bd0c83355fc59fab7ba8e76f689227015f4c73f6525ae45391536f6cd5db257b74f8e4b1392f83d27dc17798a19afcb3e186a705 WHIRLPOOL 4ed7547b57b73233afd1cfcae18f60cd832d984b1358fda70971cc5acb251010c148b3a5f777ef3f91523aff660398653af8aceedf7362f815a64c822b64cb7f
 DIST gherkin-4.0.0.gem 31744 SHA256 f902794d86638524686f5930ad505a346ff411553aa6fe7537e43c78d29637e6 SHA512 5260d1a5e083b497ddcafb04796162f8bfb62113faaf956df0a082414962eb9ee141c0198bb14392606b917e9ff778d22a8968979f44cec2b1d0bb0969b2221f WHIRLPOOL e3e3143e5ee60ce86a5f8a03ee95a4311d3eb23deb0560b8b4e63f25ea1dd69a4ecb244642283b692369427d974b8814c3b5b54af01bc5ef6196af1fc4aa036f
 DIST gherkin-4.1.1.gem 350208 SHA256 bd2783f118c304120f7a2532060be4e4f10196fce798c8583069c45da85e51e8 SHA512 7f44c0a9832cd27ec25a364dd9d55e3de8a57505a594f6a691a5db12472c9f8a75029ad7fa5ad56c9a658e73c518f5e0d4f6633bd929cc5ecfd3bfe6a009ca40 WHIRLPOOL f9ce057ea7837e81cde46a88956bf85f14a3c0aeda865befe813f52ab03e0792e4d434aced87a0e1e06f67f859770d705509bc4626584e4b23381ed9a07133a1
+DIST gherkin-4.1.2.gem 350208 SHA256 e76d67206cab6f5c2b5c67099edb08813efcacba9a0a5deab45fb492d24d2588 SHA512 ca48b653797ab0ee0e189d92d22eb48de2cdd376634ab796b3796fbc361a69c704dabab3cb8efc80029bec711a17063cb4d8c881eaeb74ba76d402b59a93c1ad WHIRLPOOL e087483bc3dd25a952dbdb0e0eb0da52541dd3645985cb5fa203e1bd11bbbe56d371d743bd38d1c6138c11441e31d7e210b13504856df95760705c79a594a159
diff --git a/dev-ruby/gherkin/gherkin-4.1.2.ebuild b/dev-ruby/gherkin/gherkin-4.1.2.ebuild
new file mode 100644
index 000000000000..69941e0dcded
--- /dev/null
+++ b/dev-ruby/gherkin/gherkin-4.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install support scripts to avoid slot collisions.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+SLOT="4"
+IUSE=""
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
index ef4fecf3b9ef..f6eee6617f08 100644
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index b079d88b24c7..87aafc8bcbd7 100644
--- a/dev-ruby/html2haml/Manifest
+++ b/dev-ruby/html2haml/Manifest
@@ -1,2 +1,2 @@
-DIST html2haml-2.0.0.gem 20992 SHA256 91345409d56f3d86d927fd2d8b665ec9b896757928ae8a898520804c91673f19 SHA512 d888a84432486a143dd6f3947ce6d83a043d3fd19bdab5f06d990bd689d85b8d683ce6c4796902d264cf6e1b400b246e94191d6ddf03f5d98b27ee054f6a4006 WHIRLPOOL 2fd7bfc5ac27f01114e81c0cd73e4c90cc82b65d5e6e52ad137d71d60b3548273a80e46e5af527dc3a89c8a64e2b6605ad79d88f4169f78aa431593be449889b
 DIST html2haml-2.1.0.gem 21504 SHA256 b02b1e372ae7a2c579fc9b3c4aba8730e2d278621af6bb5a52b7711482fd20f4 SHA512 508100b373f0537466fc3dba941ab78477adb5dcf0b699ff9f675cc1c51d7d76aa3405a8f3a85205106e1d0161c73ec383091c9bda856044370a7746023b260b WHIRLPOOL 528f84268fc0729d11c33df90cf7eb4158eae1e6d14bcae0b49332a9c8e1f9f8823b4f452e72b91b15122be6883333ce92d7d9d87e92ca9b043b7c4261cc3ad1
+DIST html2haml-2.2.0.gem 21504 SHA256 a3b4d38d318c5101d89d7a82af790f4b18c600ef73109220ad254ef150931935 SHA512 b6988182073f35d4d9b9f07f2cc2ba01c66679fa646fd2d1e3c8cf0643c88b04a2b1a36d584bdcca897f804e32486a618abc8fbd8db023ff9c22ee66d93ed9f0 WHIRLPOOL 4cdd78ff94b5132898cac8b17702e4af39ab4595847d1d9724afa703adc416ddda91374d3231b5768a995dd3d166ddd03aa153c8c552e3425bdfb61725c9558b
diff --git a/dev-ruby/html2haml/html2haml-2.0.0.ebuild b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
similarity index 84%
rename from dev-ruby/html2haml/html2haml-2.0.0.ebuild
rename to dev-ruby/html2haml/html2haml-2.2.0.ebuild
index 63b5e4a11492..42b2430dc7cf 100644
--- a/dev-ruby/html2haml/html2haml-2.0.0.ebuild
+++ b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23"
 
-USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
@@ -20,7 +21,7 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/ruby_parser-3.5
-	>=dev-ruby/haml-4.0.0"
+	>=dev-ruby/haml-4.0.0 <dev-ruby/haml-6"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 07777e15194b..ecfbacf8c079 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,2 +1,3 @@
 DIST rmagick-2.13.4.gem 1539584 SHA256 7877ce2fe1b05e51e62b0a4f5d17ecae6223c17bdb61c9b4e1715dd74d541afa SHA512 c458867654af82adf10e74408055920e01963292c7890b581f473f30a8b090998f085f1701e42190ee1f62de44fcecb5e593df74e68c9d7a8fc8050f359ff643 WHIRLPOOL 2aa5fc6dbc7787d41b46ec36c6e85540aa85e020c9e060df6d2ea22c74e80665f68c32e07d70a10a3a95911943c25724c92730f1edd05c7ccda3867bb725d239
 DIST rmagick-2.15.4.gem 1545216 SHA256 69db6635c2630ffd63c1858646cbc280226f31a7bc34e1c9d1322c2c73e1e386 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80 WHIRLPOOL 92e62fe057c6cd918577ef4a5d54021514d12cb631f7e6debbbb44f2260f361f719a03e973905552dd54089ac65f51926177de43024d0734ff0557cc1e0e0d62
+DIST rmagick-2.16.0.gem 1545728 SHA256 06d3c969889d31065127e90a612904c575785293420f6d044a8b4dda58093d55 SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c WHIRLPOOL a0ec80ec7fc124f4df1172a42e9f6def4c398ca8378e029e77ad8ab35bfa88a9594e2051969fcd424c17218ceab671b558f9a7882a9bb88d504fa8f0b2fcad6b
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
new file mode 100644
index 000000000000..861c52d6f494
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/gemhome/rmagick"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.4.9:="
+DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg]"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+
+	# Avoid simplecov dependency
+	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Avoid some tests that seem to be very dependent on specific
+	# imagemagick versions. color defs?
+	sed -i -e '/test_\(gray\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
+	sed -i -e '/test_optimize_layers/,/^  end/ s:^:#:' test/ImageList2.rb || die
+	sed -i -e '/test_\(background_color\|border_color\|image_type\)/,/^  end/ s:^:#:' test/Image_attributes.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -Cext/RMagick V=1
+	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test || die
+	RSPEC_VERSION=3 ruby-ng_rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		dohtml -r doc
+	fi
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 1e928be6c2e7..2aea9e8736f6 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,2 +1 @@
-DIST rubyzip-0.9.9-git.tgz 59030 SHA256 897cce8c2aec4fceff51b05e353b73d7d86567a0efa6bfd6e65274ba53a3da17 SHA512 2b2b035ab0da92ff09e1a916dd703c6b3c0ca423db4a5b4c12fbbdc6018c370532721447e71559382d089172fa4ce3463d9aa148c460a6a0a4ee2ccc9df2cadc WHIRLPOOL a51746c4234ad9f993426da44ae75ad36f40ec3292eac4a0410f3bdef9ee1093542ccee2c893967daccf806666af7121e253dd113e04aaf445f5e8a0c4bc183f
 DIST rubyzip-1.2.1-git.tgz 151085 SHA256 03f233563b9d4bb950da01b8c4dae80f83c797d1adee478e5e9fa3aeb78a6c52 SHA512 ba71d293120943142608b617d76d72699c64b92a6bf602543a3f42f01c44eea3f0c902bc841a2aaf9cffac4a2ba02a47a847115eca1093587d944c2f4acc9b9e WHIRLPOOL be38ab13075f524e4d1f6f4c040320be5254dfce9905d580f1118910c6bfbc4e5d4244cd3769a672aa83f5ccc2446d4bb4f25de32d9797a6ecd3a3827d47a066
diff --git a/dev-ruby/rubyzip/rubyzip-0.9.9-r2.ebuild b/dev-ruby/rubyzip/rubyzip-0.9.9-r2.ebuild
deleted file mode 100644
index b111246ca10b..000000000000
--- a/dev-ruby/rubyzip/rubyzip-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TODO NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for reading and writing zip files"
-HOMEPAGE="https://github.com/aussiegeek/rubyzip"
-# Tests are not included in the gem.
-SRC_URI="https://github.com/aussiegeek/rubyzip/tarball/${PV} -> ${P}-git.tgz"
-RUBY_S="aussiegeek-rubyzip-*"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND} test? ( app-arch/zip )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index cb902176ba83..eb310c41c93c 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,2 +1,3 @@
 DIST slop-3.6.0.tgz 19570 SHA256 8fdb0e81e0636f7a266b5f12e1fa419c27bf1b529f0c48addaaa9b02bcccf1ca SHA512 48bc2f56070a6f65b865b76dd5ba2e0e434c2ac5f9efef89301833746c0d01e5d9769ae02cdff8a4cfb0ed67d4306d921eafe086f49dafa0af8521d14bcee2a6 WHIRLPOOL c33dfb201a24c07e3abc56fa5c0944caff55814ac42d462e607a63c7d60e7fb02ba80accd020f572331c0bd9abd823446538e81b8039fdf5bab6bfa26d24e5d4
 DIST slop-4.4.1.tgz 14506 SHA256 0a936bbc6b21cd2d2a5c2ec6448b3151fe7023d71cc124258877e2d31caa15a9 SHA512 fc0675ee82664195823e5fe465d0812324722b1ecf8d998e13cdcd2cafa7f5ddab3b10b2912ecaf6213f44edfb8baa09e6437596bd4a9a3d7d329efa52bcfc1e WHIRLPOOL ae2ac799ad47fa2991f8baf668515fafe425a5e1adc71474ffbd0fbfd85f369d908edba20478a24d930f53106187ec30e0febc0baf446d1a7d5ce9d1bddff201
+DIST slop-4.4.3.tgz 14763 SHA256 acc1d2886803bb019c969bb1fb5779008bdf61ef52238063746eb4c431766906 SHA512 ef34bde9a11734b833270a7a2e5e41996c448d02ab4af37950abfd053c817d1075f0ec2fb8068642d784e2e285b9cba9d6e002f97a1a84cc7dba84a319624544 WHIRLPOOL 99a21667a2571d15e33685c7ae256c22c21cff2c86c1f4240d1bcf24eaef53e9dd5acdc192042a9a3b54c6779b4f72b97120b1f050008974c16fc64fcfb201a6
diff --git a/dev-ruby/slop/slop-4.4.3.ebuild b/dev-ruby/slop/slop-4.4.3.ebuild
new file mode 100644
index 000000000000..2ac06d921083
--- /dev/null
+++ b/dev-ruby/slop/slop-4.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/injekt/slop"
+SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
index 5c0e4c5d91f7..172146d38f26 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-tex/tex4ht/metadata.xml b/dev-tex/tex4ht/metadata.xml
index 13170c3184d8..cb4c69274d0d 100644
--- a/dev-tex/tex4ht/metadata.xml
+++ b/dev-tex/tex4ht/metadata.xml
@@ -5,4 +5,7 @@
 	<email>tex@gentoo.org</email>
 	<name>Gentoo TeX Project</name>
 </maintainer>
+<maintainer type="person">
+	<email>ulm@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
index 41ed4389d57f..fdd8576a59dd 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
 
 LICENSE="LPPL-1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 21edfac5dc43..4ff1a66568f2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,4 @@
 DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 d04cc6dc7ffbb8e16426e85f50e3f3c3037fb42a0e746d0604a412a00d31444e SHA512 36140132ecbe05d07b167e2895c2909ed545371af0962cb8246beb61a400fad14f56394c90cc2319e4581d5e97116069bebe466b87451a9a83f04095ce9b0510 WHIRLPOOL 07f49188fc6d7f6eb005f8e82526c33401b7ee8ff7839c4620280774650f9be9af9aafefb6a1f9ff2648316123aa1232b53924ef9dda3ce2268f01560d53606a
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.0.tar.gz 7503379 SHA256 cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 SHA512 a261088073ab41c41b461d155bead82b580225c8a4d32884715fba5eeb892acb2f73ae0484e823d7c33c9e29f331ec34ca223987f05e3ceb9a2f9b7defef17bf WHIRLPOOL d3a38fd5079effd6d9da3e21939a39019ee332768925f311bd799047c57f83918ee204a51abbe2f422c4200577b8c15e483fa8059be7863eb13196cc443d7e39
+DIST cmake-3.8.1.tar.gz 7503955 SHA256 ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 SHA512 2164f502900a803928f2df3168fb5094de05392fd62d30c55d08de89bdd4ba7323255e724cbca260202edf1691bd5c6be63c585f75ff9d36bd0d35b816c2fde0 WHIRLPOOL 6ef8f4bcd5186e6efb3aa95a6f09ab686ee21adbe049d74c75e6c2a60ecf2d61328a06b14e4a15eb421bd495dfee128c30a50c299c8681640e1deff546e9309c
diff --git a/dev-util/cmake/cmake-3.8.0.ebuild b/dev-util/cmake/cmake-3.8.1.ebuild
similarity index 96%
rename from dev-util/cmake/cmake-3.8.0.ebuild
rename to dev-util/cmake/cmake-3.8.1.ebuild
index cd68286d802d..98921d9a61a8 100644
--- a/dev-util/cmake/cmake-3.8.0.ebuild
+++ b/dev-util/cmake/cmake-3.8.1.ebuild
@@ -16,13 +16,12 @@ LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
@@ -33,6 +32,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
+	server? ( >=dev-libs/libuv-1.0.0:= )
 	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 "
 DEPEND="${RDEPEND}
@@ -147,6 +147,8 @@ src_configure() {
 		-DSPHINX_MAN=$(usex doc)
 		-DSPHINX_HTML=$(usex doc)
 		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
+		-DCMAKE_USE_LIBUV="$(usex server)"
 	)
 
 	if use qt5 ; then
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.1.0-r1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.1.0-r1.ebuild
index 240e6008cc8a..fe446336d5ea 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.1.0-r1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.1.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 EGIT_BRANCH="5.1"
 KDEBASE="kdevelop"
 KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 321553871a8a..23fd39ae368c 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
-DIST widelands-build17-src.tar.bz2 175547379 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512 ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d WHIRLPOOL 35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa
 DIST widelands-build18-src.tar.bz2 183443325 SHA256 6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72 WHIRLPOOL ca46c70d951f83c00c37465bc0da9eb94d8d66be50e00c015ee6264ebc99669eca08aeb4117fbcd97fcb7c0e689af4947ad96c231746fc4a2626bb6ac4005be1
diff --git a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch b/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
deleted file mode 100644
index 419d5d78a35b..000000000000
--- a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed May 16 12:06:13 UTC 2012
-
-respect CXXFLAGS
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -209,24 +209,7 @@
- 
- # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
- set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--
--#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
--IF (${CMAKE_COMPILER_IS_GNUCXX})
--EXEC_PROGRAM (
--    ${CMAKE_CXX_COMPILER}
--    ARGS --version
--    OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
--    )
--    STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
--    IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--        message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
--        message("Suffering from gcc bug, disabling -O3")
--        set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--    ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--        #This line is the default and should be preserved.
--        set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
--    ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
-+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Release compiler flags" FORCE)
- 
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/files/widelands-0.17-gcc47.patch b/games-strategy/widelands/files/widelands-0.17-gcc47.patch
deleted file mode 100644
index 9ea19c3571db..000000000000
--- a/games-strategy/widelands/files/widelands-0.17-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/main.cc'
---- src/main.cc	2012-02-15 21:25:34 +0000
-+++ src/main.cc	2012-05-02 07:43:01 +0000
-@@ -28,6 +28,7 @@
- #include <iostream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <unistd.h>
- 
- #include <SDL_main.h>
- 
-
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
deleted file mode 100644
index e8e0ddf80ebe..000000000000
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-gfx
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib
-	media-libs/glew
-	media-libs/sdl-ttf
-	>=dev-libs/boost-1.37"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-PREFIX=${GAMES_DATADIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cxxflags.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
-	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
-	sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
index 8b1942ab2fea..2f40ffaa05d0 100644
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils versionator cmake-utils
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
+
 DESCRIPTION="A game similar to Settlers 2"
 HOMEPAGE="http://www.widelands.org/"
 SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/lua:0
-	>=dev-libs/boost-1.48
-	media-libs/glew
-	media-libs/libpng:0
+RDEPEND="
+	dev-lang/lua:0
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
 	media-libs/libsdl[video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg,png]
@@ -26,21 +29,18 @@ DEPEND="dev-lang/lua:0
 	media-libs/sdl-net
 	media-libs/sdl-ttf
 	sys-libs/zlib[minizip]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 CMAKE_BUILD_TYPE=Release
 
-# Game is NOT happy being moved from /usr/share/games
-PREFIX="/usr/share/games/${PN}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-cxxflags.patch
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
 	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
@@ -48,22 +48,22 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=/usr/games"
-		"-DWL_INSTALL_DATADIR=/usr/share/games/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=/usr/share/games/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=/usr/bin"
+		-DWL_VERSION_STANDARD=true
+
+		# Game is NOT happy being moved from /usr/share/games
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
+
+		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
+
 	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
+	make_desktop_entry ${PN} ${PN^}
 }
diff --git a/games-strategy/widelands/widelands-0.18.ebuild b/games-strategy/widelands/widelands-0.18.ebuild
deleted file mode 100644
index 5857977c9437..000000000000
--- a/games-strategy/widelands/widelands-0.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator cmake-utils games
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-gfx
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib[minizip]
-	media-libs/glew
-	media-libs/sdl-ttf
-	>=dev-libs/boost-1.48"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-PREFIX=${GAMES_DATADIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cxxflags.patch
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild
index f32132e97ef5..7cfcb4a5c8bf 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
index 40e6b673050b..a82b0cf0f772 100644
--- a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
+++ b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,6 @@ src_configure() {
 	export CC=clang
 	export CXX=clang++
 
-	export PREFIX=/usr
 	local mycmakeargs=(
 		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
 		$(cmake-utils_use boehm-gc BOEHM_GC)
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
index 40e6b673050b..a82b0cf0f772 100644
--- a/gnustep-base/libobjc2/libobjc2-1.8.ebuild
+++ b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,6 @@ src_configure() {
 	export CC=clang
 	export CXX=clang++
 
-	export PREFIX=/usr
 	local mycmakeargs=(
 		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
 		$(cmake-utils_use boehm-gc BOEHM_GC)
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index f9b17c1b0664..220d442b2c5e 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,4 +1,5 @@
 DIST lightning-4.7.3.tar.xz 1134460 SHA256 8834c59a58797af747805f9a67ebcc311607a98bea4d185689d7c35f024bce7b SHA512 ebca7d74413a15f404ce094e5a4d047d79f250a04c6c1e78a3ab5aa49946e1e1ac81a1f7703bf2e631d841b98df66a21982788ee15af14eefe1d51eca29e1d48 WHIRLPOOL 34a28dcf707fe564433a663c2ac3efc79dff409cf22383425f38d4ac06184ac980f35a6ee81ab8e9d7030189538188ffe2d5fa426e0aa1cb8a11ebe6191a5fd1
+DIST lightning-5.4.1.tar.xz 1891296 SHA256 2c7eb418eeb54919542cb097c76af8c61ada1738b30562a54dfdc1091a416e7f SHA512 d5e6197f53443f7baf2c8487293e59ce825bd835870c2b38c64feefcf3a20ee46a41e9c2320f55157bed1a647ef51e97b74efc1d1ad41be34caefc943bfdaaca WHIRLPOOL 5e046c862e4fe9ac47a7be4d7fc3342ccb67b8f76c1f8b542f75a8b81816ef7edff9b478525e2fe0efb7d21eb0fe8cec3ee28185a73338ba59e84de3dd622c4a
 DIST thunderbird-45.8.0-ar.xpi 490775 SHA256 4b8787643041672aad90d1297eacad510ec88d04461d19680d38e004add14f21 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c WHIRLPOOL 76ce6c4ff429fe4cc51f87f297ebead9962503ca1fd68c8e0783c43d9898bf370b00a222b7b17f1ed191f30557f9181b56019dc6ac3757fc08fdd53544039864
 DIST thunderbird-45.8.0-ast.xpi 428059 SHA256 0ead56ad0cd11503a60d5f75cd181c0c85eb7ccbc42fa69c76d3cd64f29a0cd9 SHA512 eccf877f29099445ef59c833929a50df7424aa475b1ceb432d6c10b28c71b4e25d840a4fedb1afb3106896da0afeb47a3af1b763553dc6ae40f7bda5b0d65040 WHIRLPOOL a370c261f19a1f1ef3da37abc7665d8f1fb0ba1bdc75e5f11dc923e08a0c7a0b891e166cf99273222d0aee92a4d8a06f38ebc5168c121c391b53909cd6e79690
 DIST thunderbird-45.8.0-be.xpi 469096 SHA256 2836d2485234e541fe2d227af8f8c477173051d6bd6a9db5bab6c64a74fefd04 SHA512 76c758a68685f974d174f5787b72e5f1955ba9be00c305e2e1b1adaeb17e4e7bc765d1263d6395cb89656112c936618d84cb80a7dc860684d49a4677638eef56 WHIRLPOOL 6413aa5fb12931034ebde044f747213bf4da53036b5af9184ffb1c61d6822810669561e8290ec02c016b2add1e25a4a57469dbe42b91384eda6980edb70c9a2d
@@ -55,5 +56,63 @@ DIST thunderbird-45.8.0-uk.xpi 536438 SHA256 168d7efd879e77f7ad7c3e4b736e486110f
 DIST thunderbird-45.8.0-vi.xpi 540498 SHA256 39f64a6acdc7c916ab73c279db67f0f51db77d756f2154ca22420695e8e5f95c SHA512 8b25e83624ea59a231af846e4d9baa6d7640c26d70b6e259731f7871af594435d18dd55da1341045b81fc53eb4e9427b5b968d12d6699816911e687a16dcc51e WHIRLPOOL 2b826048ef8188f5e39ccecddf6970787ffec4b663c41744424267a213c89fac8f3fe323ac00197fcced814b34a88b815f9e6fc5f03ebb4ba2585d1ec3990feb
 DIST thunderbird-45.8.0-zh-CN.xpi 489209 SHA256 05f2e3d25501ef42422e9e2624f15ea61f48a355148d867c29626af1b09a769d SHA512 346e15d8bec51831c2205a653e84735abfdbc6db1266a8545d138ed11f492d58f3529fc15870eac3c7c28cc60300de2fde85b6927338a2c8fb03ca90449f8a81 WHIRLPOOL e00e1628bfc9f260f40f554ddef9da7a10f16ec7eff86f9d9602f2915c265174009e2c45e8fb862454aafb3073f4ab88fb3a2079acf62c3c36bdf42272cc9968
 DIST thunderbird-45.8.0-zh-TW.xpi 490850 SHA256 7de83d5ec93a97bfebe8a692313998c02479c8bef705983d3f976360a4a02094 SHA512 0b473f3eadbcc63225c5f2b90d6be26d79a139aa72120d45dcfad4a22a20309f11c4565e72bbe9281f0ea0fe508173e046d3f747975f1619f6717835361ab70f WHIRLPOOL 20e7590e8dae3ae07e4823ff855964cefeb479143e7761974c715a214f2b48f9f957a536fc2f300cd3da61d8464c073b0015ffd9576b6e3e6998ad7cfe8112f3
+DIST thunderbird-52.1.0-ar.xpi 604235 SHA256 cd1d424120449b922d970b3fee89d753ae231354e4181a4d4700dc807504f6d1 SHA512 d23e9005a3e8bd720eb647e4d964495946d708e84afed2c099b417364788aaefd2ef5c4c14e2ce69e97d62b121f2aef8805cf2af9ba12220800ea21e644fbc23 WHIRLPOOL 3ada5c0463b06e38490b47e4ec71181d531c68d7f5fa328773954598eed1a680abb7cd25e6b91a78a06313dbc7bda1c7a63c35b491bad1658d294f9f1faf8f90
+DIST thunderbird-52.1.0-ast.xpi 541172 SHA256 d920be2b1070c04a806745a91e15ab1139d5d2e97480755dd62642bc15222c40 SHA512 c2294166f33f34b59e1ae6873322ae9b439d5315c2aa896e101c7169956a92059e85248d096231c15544162d2fb69e9e6a1ffa126697a441bdce66564e29f223 WHIRLPOOL 38118dddc6eef5932791e2960b52f9f435c3612303341e3ba719b15f2242259d61f3a9f78506b01474a3afbfade531e5b61ce02b949dcca4d3992bdde96d9a27
+DIST thunderbird-52.1.0-be.xpi 570931 SHA256 9da12e3f1b9bccddddb673c7e8b613badecd2e71b28aaaccf16ea6ec4a64e095 SHA512 24ea71f32f033970fd0166e49ac0598c267a50e7ade20948392cfad82d4774f1d62df6c433f360e52432cf74b1e037bbc48a00f02a34a0b3dfe3a91adb13b89c WHIRLPOOL 3d07f54fda9c689ef6fd127d67034f57930817fe501311a0260fd30156f2582cfd6ea93ce2a6690cf9f2e184a73c10a88318f6ee4bcc31a4ad587034ab40147d
+DIST thunderbird-52.1.0-bg.xpi 634897 SHA256 151a7deaddafcdfd704abf7f933daafcc1f1465624b01a856f7c0ff02e3b8701 SHA512 eb47b8a1f74ee72240bebea80e13997aeaa0fcc40830f7e368162b2f37338d800ba633f82f2e0320bfd3af70fd8b39abea2c8a851e651084d87d777ac61250bf WHIRLPOOL 56a9328619d289ed6b201d9e91768788f1762e50db7ee78a47e11f4a67fdda9633671d702ae8ad98237dcdc4b84a627ceefa3524011cd10689474d8ffc232cec
+DIST thunderbird-52.1.0-bn-BD.xpi 676900 SHA256 f281a18cbd823db0331e351f02543249b90d414f9146579b52d45f2826463403 SHA512 745246a0ff5feb3be5b314cc2779df630c8d400e09913b101e875b4b4baf27a5998f6325bfde700c40fa009073bb2d537d6a37ee1051d45551918ddb5b305858 WHIRLPOOL 584aabde71b51529529af4c006f85d1fcbee32d843cb505128c9fc9472caecd7f49ed092b9d132719438f2cf132539a2542df0758a0dcd1c2eef99a307c84ef4
+DIST thunderbird-52.1.0-br.xpi 559380 SHA256 b31c85a62f99cc6f8e043f52b16f977124f3ba89a0539b064b0b751910496689 SHA512 692b658c488adc4a10c60efb01bd08ff58699af8e7dadd22ed22e17f3702f306ff753e372034c5839a62a755b89971d51bb071b566de0a562df36ba000f4b4bb WHIRLPOOL e4a2755bb8229e19be7c4dd61bd3bb20e9fbd8838c38646e8beb2a2b31d400c0069189ed98bdc99d18e950748358484d2d388549e833664b3e51b408b74d0f5e
+DIST thunderbird-52.1.0-ca.xpi 569909 SHA256 5bb06005edc6dc5cad1836abf4bf2a79a71912a841ea5dcede9ee04c50410e3f SHA512 90d0e8c282039657f4a7d7c71c095dde77c3795358b1e49d67c29372e662ffb3a342f4de56a4403e0c4273032ac0479974a6efb9943c2d0fbc1cb5952728f770 WHIRLPOOL 665982d300fb9fcb6dc795a6515347455f651c768915430162bccdcd76212c033c434f7fcbefd7a86f96c21d7f4dd99d4e8f9b4d6f18a70d5bbe407b36dfc317
+DIST thunderbird-52.1.0-cs.xpi 579149 SHA256 41d2fcc1cc5aed3f6036f6337bf93aaa9b37a32e99bd9145f4921a6a927b451b SHA512 b6358df8b3ed70c56d3e55f4a546061480f4e0250b11156987c7a3891d9266837db1b2fea57f258ec08d9337d11a7e368e1145ea0a873e2746e51ccf1d53c0ad WHIRLPOOL 94240391513569989016e1a0fc30f65c7f2041c7710b2918c7ca6a3d6224e04574020be326561a2b4f7c815b9248dc5a3caa1090dc81d10020bdad5d4d2c5db7
+DIST thunderbird-52.1.0-cy.xpi 554857 SHA256 28321a38846a06bed47996fe5f68c5579baa6c8804138866c307df0d26147fd5 SHA512 2cb7bd0351cbe7b765312db4dc66813e7b8d12d1180d8affdd3d1eeb4d9f9b24c9cec9243a5a07bc023a4eb603878614e5c71080cda9ec8199df666360a9ae30 WHIRLPOOL 9588f113f1c57c0a257029d7ba616b29d60510b72d48af74892fa268dae546b2496209cd96dada95ee49853bb4736eb01e767fb6fc892a41e7d8a9fcf9233722
+DIST thunderbird-52.1.0-da.xpi 543334 SHA256 ee813026f6312a6f11572422f0bdac9bb866eb820d8fef917bde943747df18c1 SHA512 03fe662f42e15c049d212e7a5db23fc18774267d88b058a43aa11b92959ee52c522cc7d2a8ff86cf593b203aad9b86e209da85c13f751bd64594826b4a6fc6ec WHIRLPOOL ee9bf7661be6e86cc862b340c827dee16ec9969cc7b35d3480f7f37e004025753909b274054ab74a0bb1a27a681e0cb4c27f483b41779403555d9a14db319a48
+DIST thunderbird-52.1.0-de.xpi 555743 SHA256 bfa9265887d64317841f85222638ec901cc95ec230670994f2231e65d4952836 SHA512 15d7c44b1e7fec2b58e15a59bc54671a698f311109dd1d2cabf017e0c03aa92c71d30bdbd33d75334721673a46fe597da8b7ea8a9eb989fc4ced3f633e9dd4a0 WHIRLPOOL 93728e0b578bd08c47cbb3f3d91d5a1901674a2e0173f5d66997244191c43eeed7b1f5a582868a3ad0f9fe609c5b1c62b42bd6c06ad750c74fc52521004623aa
+DIST thunderbird-52.1.0-el.xpi 662964 SHA256 eedb7abd583f2a4b7a61f81ad79d5ff02159535faba07fc30088776e75837207 SHA512 b8dcaefb514a9fb8571fa40b8968d11a0206f09e5f6770f7bcf4f0edb9f09a8cebda1a1e0e34941bc94acf66fc6c43df88dae420b8e2a5b906b3f8f03ef62b98 WHIRLPOOL ace05a65e23e9422edb73635f26d4cf4e13a95f65c5a83fe583db5d972fa8398693846add1be4aa69972e2e90d78d51563ff4a444c6cfc51f61353bb97fda013
+DIST thunderbird-52.1.0-en-GB.xpi 531233 SHA256 b916e3be5c5529e321a8defb0397dadc45116d9d06378e86d7007d7babe9fb45 SHA512 7e745b7b5031ba74c1725fae9224a8ab41adc97e43bb31208cd29e23f07aed5f2843cdfb0b58a7d534d1e54e8bc340e589bf7e1eb95213939a1bcf2822137b45 WHIRLPOOL f261db4a9edda7c17ece9251f53a6e46c142517a7248f1ab8daadef01048bf9e4594fc231f1ddc96d4f1dddd547def0a6ad278f188133291562009361c8ba3bc
+DIST thunderbird-52.1.0-es-AR.xpi 565995 SHA256 1140407c98f609ddcfeef4ad9a3538e3c68da86b3fa8a138ab042453e737645b SHA512 2bcb0651031ac70b9951f57871b584f885d996003b73b8288d2dec4e218be162e0adf6547c29f2364e1861dc86a580393adb8e377be9c357e4642e86f02900d2 WHIRLPOOL c3227f0d703898fc02629767277a8156593a4c9fd67d8b18c8122226d01174bf81204bece4434ae7204e8c222b13ca0cadee7c8c2154cae5d9fcfb58a4f792ab
+DIST thunderbird-52.1.0-es-ES.xpi 445464 SHA256 1dad4a61a98a594304708eb8c3056463b07482210cf404a1cc5ab96736eb9c94 SHA512 82058c06bfcad1cb0bb96ca40cccddfe459ca9980cbe3fc5c83006ab4eac01fceb22b4aa1f180f9a7523439a30b990cef4054ab3449565d732b0b7bd27eb5cd8 WHIRLPOOL 81b53da8fb29e3db76709166b9d13c561c0b6136bc8399b09007a5f93636155a35b05cddf723a2729e524c869c1bc443e5462ec0a0b806d03e59046e9ba68e26
+DIST thunderbird-52.1.0-et.xpi 551660 SHA256 b54d1f3692b492ae7792ee42ba6c15e668e3ea76021496464feac0414bfcae52 SHA512 7a558b18cf39efd334620219a827e342e1359ed47e1366d43e9e95c321e8bd6741d40042eaf73c0501b7aba1f86204544083ca513e9180cdd0953fb52fd5dc7f WHIRLPOOL 4fb90d872cefb426fe82b17ecb11e866b8a9db40ce5b89ed32b47485cace5099c8b2d24fbcb275b04f521ba67c07e5d00eae79bb3aa9043ff10c300ee00417d7
+DIST thunderbird-52.1.0-eu.xpi 555536 SHA256 552f2943a37ec9a3f997d904bd5b852d7cdf9977f0b8fbb87b511662f944e986 SHA512 2bdea0855d8282c20b484c3dc83db584b5284fd579ec21466fec95a62aecd98cc036ff6038b520b4f60c826dc8f96bf98504132d0617f302f8f6a36ad0af8060 WHIRLPOOL db613a525bf0e4bb71af7881d2e0c5e8112332087b921270e55dfd85d1f0b228468b5e2913ea18fa2de96fee8a02a7d7501d6ddef0120d7cc5f100242cb47e21
+DIST thunderbird-52.1.0-fi.xpi 550669 SHA256 aeb4bdb8cd8a5e1933b784e16ce121c6653b4aaa05c2c6f9b056309933521475 SHA512 b74cdccc3c3b53ef2daec49ab08f645a3c55a43b67a80a6c90733aa3c2af918c71807ca48caf568d121eeae8c5185c2bcdca301390bcb266ab0dff77af35a50f WHIRLPOOL fb11450fe98848922ede46e6225eb785fed539b1dff65b0cf7869e5d2bfecff6f1a890017a3e05c1dfab541b004351b9c9e9b3e82b9a4e6f3a29055d010dccc9
+DIST thunderbird-52.1.0-fr.xpi 577560 SHA256 f41fde901cc9210967ec39e3d258ad568d889f07a1f2fb1e10747ef933631cf0 SHA512 053c4ce7a6a035d8457ccacb012f1a4df29384d7ae10a06180413350f58b3056af05b63b9dec5736539b76a0719c05f6649bb600bf41c3e60a21a205d7f7cbd5 WHIRLPOOL 82c66486a154146a8d81524c98604d1b843d9f77516e614cb5e4cb212a6de22288c30c686d51c2517378e50f5af355f37be42547ba02143ae21bfcc38a6978b1
+DIST thunderbird-52.1.0-fy-NL.xpi 563631 SHA256 a7e856a42d8e021f1e1385857525e5ea751ff143ff725aa15eb6e1c6b78c76cd SHA512 c9b389bef0e84391863bdd06f0da3152e0f0b111fbbe10ce6c744c473a14546d766510d7abbe061c4bdfd9ebad2977f077decec1472f5e6b1ebadcacab7a7999 WHIRLPOOL b98d4433344200054aba05a5b0c8926837592c6296d19738920b0495b2b55ecbb79a37285b9fafe6e335e43470f4ee23bdfad50ef5ab386bb9bdc22781d73b38
+DIST thunderbird-52.1.0-ga-IE.xpi 583555 SHA256 78aa1c4f60ffc943b4541d8ebf08a9c804c7f8c0dad3264e6f09aacb1d5c9e74 SHA512 a5396e26b6f371ed27865085231d14c3d83b748a7647aea8e4eb1905ca901253a81969c57263c167b69ef695d37f7344938d0f10ec058b48ca90c640f18a1675 WHIRLPOOL c14c967b4c09d53886a2e2782d0a24c8d97d1af008663e33830edf65a02d312f8e5782fdf735789deff028677d7eadb8c912d86269e8ce9a300dd3dd92cdb8d0
+DIST thunderbird-52.1.0-gd.xpi 574064 SHA256 d27cd41dd6595ee588e18ed10736d84b2587f192b84efcaa99a172c055513f11 SHA512 e8cafe28c0c0395fd8c355cf54bd52934dd614f3093f7535ab6217bde9e4cc24eaa479b8b79ae186bd055baddf3853a58801053e82d96f92318e6c39e1ede51b WHIRLPOOL c087b5a9e36edc605752eb39f56cd7f6403e275357f9533e41fc66c02a48918404e98065b3c0b7c9e535b1058b1fefcb9eb2a32cf69a75f988fdf2b95e4c4532
+DIST thunderbird-52.1.0-gl.xpi 575150 SHA256 8ea7ae7a48e45854e194ff300510a7f10fb064a68bf0c9fa5cc8c54bb860fa44 SHA512 73cdd21617b534f7368a99999f295e85b76d6ce1733e017bad64dc2a938744f2410c32868cd529d3224505bb0dd96cc3ab785afdeecf492a48fe1453f34abb05 WHIRLPOOL 2706aa4f1b946de4c8fe735e5bc2026a573ca555c1e5e78bcc30e2bc9f23957e8e24795c89a74e1ccd434d5bfa755b5778609b1dd0728cee725425cedae29fc2
+DIST thunderbird-52.1.0-he.xpi 592565 SHA256 100b0da1c56554c496cf93f1489aff171a6794371e0f2336206f408dc5dbb862 SHA512 e88e5ed28a0d0bcf415fd67675d5540b21f8d0336f15356fbf4caf99b98a6b4ca0171cd4eccd1510cde177a57821df9e329d11c91bf659002f256f8fcf8c8ada WHIRLPOOL 38b66c7007bb111cb7403b20bfdd8b2d8ecd3e7abb1843dc32cb7826812177d99466512cd3021ca6c26fd4ff7a29361399b456e1634e948f2f15f56a8b42b32b
+DIST thunderbird-52.1.0-hr.xpi 564779 SHA256 5161640824d3cd84dafe08f7fef762dbe00c6ec0cc0ada9669c72e42869804e6 SHA512 383aeebce239d3c9e75f31ce0bf0caa6eebd42b770d33453b7b004dfb9cf52aa82bf7678e98f99ddc0aaa681cf96f712e936d88ea8ab22674b7d579517705c17 WHIRLPOOL c91bb9441a5b41524654dac12293c288532011270fb58cbdc7adbbe9f5094d479ef1164f4312ad8acd52590e40baac741adfdb79865cdca02038e9f792e2add6
+DIST thunderbird-52.1.0-hsb.xpi 582241 SHA256 d32e7b469905e2831a311bf3b541330b530d57d7bc618d9e2f1e01d4fdf337e2 SHA512 a306d2ef3c481e1dc44dec5dc7c33cb82c5d678a12ed9c1297dc8d8ee7b4ab350f553645552f857570f454b87d7efde2612cb9346cfcb628487fbc002c1c7b54 WHIRLPOOL 480f4c8c727868f5aea745f118b49d6c2e8760aed675abe9b68064ef34be31bf88c8a12ea374bf5e91ea0df12d5277abd17e028c6d90d4c9afecb9133dec65b7
+DIST thunderbird-52.1.0-hu.xpi 586446 SHA256 e8264f71facb7aa89aa73ba19253d7d37b247d01bc98399c1bfcb9749b9b8e57 SHA512 eacd04be9ee244575347039fc0e366f7df15f5279495a4a485cc256b8e1340c77101c8ff611041558a3c25acdd0235a0858451af86e351f646fc0f23e36786d8 WHIRLPOOL ad9197d5d48179540ab3c4832679379c15409d1564bcb8f80fbc477b9eabfdc171debaddc3d5697da946a96b79ba08da5d2297281001c7c24293366929fe87e9
+DIST thunderbird-52.1.0-hy-AM.xpi 629879 SHA256 3fcf04ae1c549aa2408b131389bbbf7d96b3f5ae80ee51fbabcaf57f9af73581 SHA512 6f5c8f9798f069a919ad1c45ffd0d33e7392f1e899efcc8ea638c0e5dc29de324bde509fee685a865db859e2114d010bc9f481d4a7dbc8e56b936206142108e8 WHIRLPOOL 0a3693e727e1ab1bf19e6fbfc2721334c6181d281fb0a7550220374cad289f7521899f4676636245c1a7ad6d273544a3a8d980cc634a51325e3765c4d4fe42a5
+DIST thunderbird-52.1.0-id.xpi 546525 SHA256 b258b88c3618cf03258e1f2a88b58ed8a9ac8d6f510cbedc65d30fd0d1833a5f SHA512 e425cef70b6dbd649541c63b557a7b67bf9f1684a9ae6ce85a6f32befcca072f828458ac4cb3e38a497f6f4892c085738ca89f452a8436b6784010a23334ab46 WHIRLPOOL bb9169ca499c64bcf92b5ee4311e73e8c6aa7dfbf5dc872f5592a0a4fda98b3d7eb5a1882ca1726e39cde3586fbfe09ba544b2e67d3bf823fb68c5bb760deb0b
+DIST thunderbird-52.1.0-is.xpi 555712 SHA256 9a9ac947b7fa56ad90940214a383d1a2e284f1fae723683fdc03cc5cc044a7f9 SHA512 8ae48d6415cc460002083977fcdacf2f7ea74a68783f22bbf62f1c2bfd21db48037d1475adb2d2869ce3e28f12b1969e30eafe19fac5e47c05526c2d2e689b6c WHIRLPOOL baa769ad74eca2c94d538c06bcb81f405cca42b4c8ccbdf26c64db2d8e60d4846f73a8e4a0d06c49f6777dd37247212276502b6b4f8d374c5490d388d83e5e60
+DIST thunderbird-52.1.0-it.xpi 455407 SHA256 81439f2a46fc2fcbaba27a790d13371bb29944dbce536adf3a4bc88c57c58708 SHA512 b211c862d1d596db4c36c63090844a4f9968fa0e803c155c245733f3262cee87d3a22ae0d808a7705986aafd982e8a9465a4c2ba3f17acbefc4d92c5a216ece0 WHIRLPOOL 8b531d3128d3da5d17a980a03b4b4823af8e9a83761314d400c694a21e7b1026a1786ee071b083ffeee4f5cebc4aebe9dfb207091055bacbe3ff7e7bf520ed2a
+DIST thunderbird-52.1.0-ja.xpi 630052 SHA256 c614414408bd3ef96c0acae40c01cef76af07457f73ba3388f96ed646d0e93fb SHA512 8c18d4a3d01ffe49ed0557e01eb78671c4bd511a38a56d87b1481bc45049d700b1110a20dde4e092f010b2b2c967d40fcde18413a388ddefe15751e3989092cd WHIRLPOOL 5f4ec267387c2d1f31559b8d59a4ce7476b7c38d42bb283f88e119306196d78f2d681aac8d0e1aa18e8434c01a6fd198a8b40f6c1a917eed73118880d31eb827
+DIST thunderbird-52.1.0-ko.xpi 595516 SHA256 3f652698258901e7dfc05751b9c44e6c6cb303b9580b8393b85aa5ba532a5145 SHA512 25d07d0332efb2e572d24ead58b643db0c6e70e66e9a84335ec16d220f92e2dc6499f7fae3efc1fdeda18e0e48d7861da38d99bef894b49e97449df46fff7de6 WHIRLPOOL a0f9fde3f2495577313d09d941f84447566b2234663a4c92c9bbfa4ebfd26937c7e19c4e27b5215ddb0e2f5973f3833409884598c510d2f6e665098512e4bed3
+DIST thunderbird-52.1.0-lt.xpi 580598 SHA256 6800858ccd1722bb805a899af954a62cff97feb6645648ee75cfcb8948628cef SHA512 7ed6c0a7be7f2ee0f5a263701b8b137d592c04c92a00ad9fd3509000e6e42a820f5b3a3ee9d559f4efaccb79be1d5f85a396e16cdf805b68ede8119297158709 WHIRLPOOL 53227bed7a34e97885de37807ecdf030ebc672f210318d5babd375d51a43c048860079c9e1e21970ab59689149d667c06b68b15399d5c5c2469e66b2040bf8e0
+DIST thunderbird-52.1.0-nb-NO.xpi 551103 SHA256 dc7703816f06360432c9f7d69eb4db6524db38605bb43dc33fa61be0582ada08 SHA512 84347daa33229108ba73287721ff7c61725fd9f469ce8ecbb4711493c1095380002a4f39cdfad1ba696e2488fbb302eef55d0064aac99687d664c15445926f43 WHIRLPOOL 01d16015c90f21df52cd612b11ae8bbc692d95138fca5ea7d95e2fc4b2805ef848ff9707ff9b1e1fe9fdf117b0cb305665489ccaada00646110e7b66625e99a3
+DIST thunderbird-52.1.0-nl.xpi 557956 SHA256 cc1bf83672eba56775988c6671ac0101330df302ff7d3b34e3f8d84a3486ee2a SHA512 a57e9ca1dc65696883d588b744e28f9244a29e6d2bb0bb563a7a6d08e0415d2fd4e6ab1983a0d4c008f894389106c939151413a446d853e9bd8b8e099fc4c29e WHIRLPOOL 288e047f675c04532c93a59e33d635aa22613eed92e7a8c260188d97363aa1b8be3d95fca3770ac242e301e5c6e4415ba9a1ab81b69096f423455f5ad344f4a1
+DIST thunderbird-52.1.0-nn-NO.xpi 551891 SHA256 557458360291cf1b69634329b58e9f8d59f0e235ea23fe04c83692784aa05956 SHA512 f826d80adad2c5fb1ffda291111d3622fe2b21275936c97270b52b17f703c99d617184b70f734efbfb025f5385aa4eb87601c6103b833a8925a4a162f533bee5 WHIRLPOOL 2717c58a059a3be3a6dc5ffcbafea12408ce9984b80530deb8eee3f38046103aec3069acbd683e47ad3707a3a84b27d1546d22c6e70c6cf881a431b9868b4551
+DIST thunderbird-52.1.0-pa-IN.xpi 646568 SHA256 a7fbb749c6222a020cc50ddd11428c16c3fc9b1349b757426b9d2e2204e2356d SHA512 9bf90b4c193ac34dede24af6c8d5285f1b1882fb2793b8251141bb25449ce633665cef39e3046d902fee81e0e2136859d7789984a701c62706f3742578dc162e WHIRLPOOL 2d8b8658bcfcd96f7e7071c1a4a191092629b17b63b38bc950afc2f9c93f3fc7feec872f78cc3f328aff8af9bce033d6f71b7a177c11df60788986c96199ea37
+DIST thunderbird-52.1.0-pl.xpi 469901 SHA256 0ecfed322da41c4e6b21a7fab03d61a2436f0f4e0898928f19eac28b52da8a05 SHA512 133c984da409ecfcf0a4dbf426362206fdf9bed6ae994e9158dcb0adb38b46ae26c270857057354d16690932b92e9dd0f56dc7cc2f28bb43192c98a01bb2387f WHIRLPOOL 60b234c718914c4d0a27a084b18f5e42f7f1ed41039dd95eaf956ef743cf48af7543c0b21605f41becea1d3d982ff1fbec0e1eacf3a452d4d4f236c9367eeb8b
+DIST thunderbird-52.1.0-pt-BR.xpi 558223 SHA256 d5b5bec393b299367610794958ac2d7bef54ad2cc9a29ca2559c8c230bf6564b SHA512 cdedfd4afb27bab14c739a6a9906369ad8380da82a0f3a3d785b2547fdc020632005ed56628a240463612c38f7603f654f06ff4b7ee4ce2bfce6e2fd0f56a6f1 WHIRLPOOL c5b434edcfc37abba60d72e042750c2fc3c60b79828e8b29b2b14d500bb7ad4f470e9fa25faf251eaa190b3b652e939fec71afc7077609348dd0810891313fc3
+DIST thunderbird-52.1.0-pt-PT.xpi 565623 SHA256 998587a0074de0b0a26206c7de2cb83ff5bebd194e7ce184783fcc2d58eefe97 SHA512 854ae0aa33cc0c209347e34c2637b205b7d3b60b66ee41bb28d78bb84e88ca59acc5d191a2c57e866daacceb10699490b5da1e101648bca05b46992aec56940e WHIRLPOOL a823b2530a10b1682b6df5e660b86faccc94b9e3fb8cf269aa1e38f9570f92ff432db18814cc62fa7b752ef932931fe2a6ff33762ff9bad37034282f5771347b
+DIST thunderbird-52.1.0-rm.xpi 557604 SHA256 33a1c4dc8cee63c7640f7b492c171015b391f88b2629660b83845726925d1604 SHA512 a18488bb619fe62800bb34c229d3aea2d67b1366e1c511bb0c58fbcd36a2afaf7fdb4bc1a9549286f51b3b8b593c0d1f54ab4cdc9274022e5b79b0e28684f449 WHIRLPOOL d6c159622b1160b8b6172567f2cb332c3a05d8b8ac49a43c2bc4de7a794af1f54f524dcf80d711c201096e6b1ab4d06534e6b7fd3ad27553171ccdfc3ebd7ad9
+DIST thunderbird-52.1.0-ro.xpi 570529 SHA256 f59e4ac38e6f60808bc7552da66a74a9b059f3e6fd8d1aef2999cac3b157de5a SHA512 c7fd181488ef4c70615336ef65dafcdd7c64ea06bfd306537f9b57782fa4991e767972d89ac371b8b5d8e75e484c8b5993a50440152621ed23a3a3569fcf1e63 WHIRLPOOL 8b00d253456ea88744ca8decd05547e3eaf1dcf5d95bdeb97f85e3a048cbc26190245104fd811ca3ed0d5c91f3431f0529c1a2fe5ae053ace5d90f8ffa2a9866
+DIST thunderbird-52.1.0-ru.xpi 530669 SHA256 d152fa89d2e6769b00ef8a7c04debc6da8e8a7013a5faf92038651a99172bec9 SHA512 35d3970ff9f11edd373b923eba743e4ed37e81222e1f423de7143e9c304547dd53bd20e321af1da39fb9754b89e44c1352c28e87ab168795e8d62de94df97159 WHIRLPOOL 52e8ec3ddacf7069b76029f38aa65eadc66591b717e79581c9d4b9ae7f1804f49cd56cebb239b63e66506ce1fbd21ef50c994cc5fd90ef088923299ae76ae967
+DIST thunderbird-52.1.0-si.xpi 649009 SHA256 f4d0a47bef66689b53506078e961547c0100e7104a5960c9eec2341facad27d5 SHA512 b1d0d2f0ae18b0d12e99f9eafbba160ac71d4d4569d94281a9f1eb0cafaf33e7031647a9f0d583c10d048311828ce797a043075e131f3da79c614a37a2d40974 WHIRLPOOL 65dd414d8bea14c5c8c7ac723fea2c9dff1a4ea3bd5aeb395eb29183ebf4830cfd691fccedc433fa90cb49dfebf86e2822ae84d909abca84befa8da83e66e646
+DIST thunderbird-52.1.0-sk.xpi 583881 SHA256 5d57f3e86f4e19daf5fa0fc5cb63aaff646d4cbd47a742c04ba77259c25dffb7 SHA512 882c2f2e2a2f7b14c5557288461d1be96c36328f7f6fd2a1dfcce9ecb65cb9e8665b6547f1eedcc7867df1e6512f34c97f44c9fbb6f517e477bde7752a997420 WHIRLPOOL 987dacbc1e7aec4be7df1019e84045c727f6f107bb6fc3a72f73029679611849c6db3b651311b53523867aa0234a6ba4a07330131dbe5f59007e21f7e59195df
+DIST thunderbird-52.1.0-sl.xpi 562830 SHA256 56dda066bd8e6367351d0790a2765a05813bf19b65aeab27cbdc133609a30b2c SHA512 6a19f9f9f12904f012de0467fde97b9a38e5cdf58156fa38836887533dd0810fbfc44c1899139945ffea7fc9484b1fb30b57730a9a659345473748b022aa315b WHIRLPOOL 4416dd56228bc91cdfcdd3e2f4fb7c0771330d2a7592f0b41bf74e916d81f918fb0bdc26a78f1279756dec413ae3ce6684b50fda72e9d4a4528d05683711ee2d
+DIST thunderbird-52.1.0-sq.xpi 570615 SHA256 8a2773b55f020278f658b7254dcedf0d17154b6f5d63400943cd15bf902c9019 SHA512 444e1994322ac301408b0a00ac024870936c40320bbd9c9c81ad004e7f63180467493f261f7324fc8e0e21daebf4667cd136de47b77f9f92bf71478b03aa26c4 WHIRLPOOL 6e5770d916e8ed70b81edd4ba638c3115be8ff36ac0a12ced4af70ca99f6badeb4a5bae31ca7e44502544af49760c29a066817c8378074b0f2f8305e48ce739e
+DIST thunderbird-52.1.0-sr.xpi 609019 SHA256 09f3de38925c36734471ec2694094211236d1edae433280e7547ec57c8040826 SHA512 6a10a0de9a5dd758561d926a171718e973798331a26928edaa9ca02eeb3117edd473ae75c58fb6d1f7e833897ef0f5c6d62812eff29b44bafd7cef38dbbf654e WHIRLPOOL 69534111fb40485d90aeff89a6261b00a437f4908271cbc6173c27f2d4684eaadad870fdf6de459fd4430331c2233cf3b71c56a100da3ed163f2348aa0f4dfbc
+DIST thunderbird-52.1.0-sv-SE.xpi 565777 SHA256 5f3705d4270357b3e57fd26131155516fc51a47886a20ef143905e15334dd86a SHA512 e34c4ca1dbc47577500118b2cc08ba069cf85adfd456c56799682e79e0b95890f5f95a086ec79fa8bafe8d3256bbf14716797b241afc6f105a76e8f251724c1e WHIRLPOOL 1be831f7b5822c0bc8e9d3fb65b58304173dda353911e19c01ee698513d2a679744bb86237e997b50aa5eb6de66fc864d5319b6ec82e5e5f4473f30d6dbce92a
+DIST thunderbird-52.1.0-ta-LK.xpi 675038 SHA256 bb585f6cc8166e5445e84220cd432a99489ea898e58edcd7a0b0f2134ba73acd SHA512 5f016a5bd47dc6580bca46c39bf02f679ea703cbba6153efae47c530241dae38375427030bd89e326f6023cf225876d1b1233da9357fae35f47516a5b319f47d WHIRLPOOL 8c758ad35c8549ad29cfd447cabde7e36799786317bf7d97e2a182d985722c89c169c58149bade6528833658691bc781b9977a96f8ed9ca443d3fa7fe8cab250
+DIST thunderbird-52.1.0-tr.xpi 569926 SHA256 d95eeadbf12ae6e554a7f9a1453befc6dc3530b3e441491db4ed96aa7c355463 SHA512 ee98dcf1795e59e691d94253caff84983ac7d7122444f6e45f25f39a4c78f4b0f8dcaa798f3fc67d5af2d6faf37b0aeea6f596b5a035bde09255ab94d9f05369 WHIRLPOOL efbb32761dbb14b0a9a458017140a019ca87f8497cd7587be9d538a9404924393076e2e4abdf5e7c6b0b3c423b78609f713aeb4f07f91077cdfd2652052b5d31
+DIST thunderbird-52.1.0-uk.xpi 652854 SHA256 124146d36b56811e02c1f6a849611e4977a2189fd95b793b71347532caf76070 SHA512 f0c240927c0801feaf6477bf93347fd5306cd98f932d4590b0fa39003a7c46420c8b2ada1917e379ab84548f6bee3dc01f29ee18f3fe68fce173297151b5533c WHIRLPOOL 706874ab353e544204ee8e53e335c99d2ee646137b77cc1cab3ec188b5f28e514d90b6608d20844359c666d73eeb4e11f46526a5b74bfd7ea591dd1f9caa3d4b
+DIST thunderbird-52.1.0-vi.xpi 637163 SHA256 8e3c84b436a9d0465507bdf42dd42c9b26d23987fd7f7a46cad8dd9f6ad0afcc SHA512 8637fdeb3ae22a4eebd746a2ab0c8d65723ff13f81769025e20f31f8b143d6933278c01dd28992ce72c48cf597e6ef69ceb43cd4066b9dfe86453ff40e82bc5c WHIRLPOOL 18e4ee4fe13c4984ff9c6d91ad1709ca956f6a63610614ec781158f6f559ca75e43661d6fb4dedb60af779883b5d429b401e6f093b2f2e4596b9a4aa1217a257
+DIST thunderbird-52.1.0-zh-CN.xpi 593611 SHA256 e372440fcafc54328c5df328fc22642924eec67fd05e33f8ad5a15cfdbef878b SHA512 ffa94231b1ed5e9b978369cc683080336d89f18322b1d7ecb9787450615de13ef1d9fd33a3fb95cc14a03d2ae8f693c2f770aa8f5dacb059150648bd243f8243 WHIRLPOOL d7bac965d6d5119751ce59fccb18a39fff76435a09bff67d9d2d61d59e8530c2d6b70a48efebd4cd2296bff0d03daf90e97f2c2f284746569722693e60ee7cac
+DIST thunderbird-52.1.0-zh-TW.xpi 595728 SHA256 2ba552e364815ddebef45de1e7442add05bd81d34516a512b4f6f59b9c3cfdfa SHA512 526dce3da955c63f2e2f0f70d916433e95977f08792e24931dcf1b28bfb0480d9784959fae25162fae38faf4c75c96913b392a907f0f07181cd80222e7a263c1 WHIRLPOOL f3b3faa13dc6b8e4131f34453c68cc27bfaf24145349edc73a4670dbcfec8095eaf69b3de9e8a7a68bd5c49ddb14d47228febf28495467887eb5b0e49004b2b4
 DIST thunderbird-bin_i686-45.8.0.tar.bz2 44278898 SHA256 94298fa0c80eadfcb824ce262c25852c2eac697317df1de204c8bb6e83b3dc6c SHA512 dbc77f7814b3a085fdf54536d77db69ad893b0230ca1930fb5fbf916cc09e421cdf8987e7f75d726f1fe31f3c7ed0afc584da1d1b1636a2750e9e0454a6de45f WHIRLPOOL db751b7c4223dabd340e7701fb04aef95d718131cd18e2283d772c92182ac9ac9e730f84eda0556c6f0d76373babc88c1e2e09ceb11764b109027fc1c23f7e87
+DIST thunderbird-bin_i686-52.1.0.tar.bz2 51168953 SHA256 4ecfd1b5bf5d280ea103be75116fef8f5a7e3d96a496b17833160da250de5361 SHA512 60ef6f688c237a44550a98ff061fc947dd9c2d44db4739d63948e58adbad1287f1ea2b2320d7a8b77b1c6ebd5dc48104f5ef421424a033649f981bb77978f54e WHIRLPOOL 78cec4f1431375fe60be35afc257a8f3b623cde0998b02054177258ed83a8a4ed4706fbba0a74b5837cd7f2f3c6122b28df5b357bb5771fc17c936d704d6daa6
 DIST thunderbird-bin_x86_64-45.8.0.tar.bz2 42910331 SHA256 1f90532b5f7018f2b0982fff76dde3a4d3fd10efb1729a3fa161ec3d723bfc2f SHA512 4294c93adb8f38617b2898c91d0362b3ab327158e1810d2304f2481bdc4e0e06e1fd2a2d6748cb491cc6c732a039fa3dd83dac801b12ec7be2d7c8cf7e986286 WHIRLPOOL 80597a0ca9ecb21cafe6d562e58826ad7bbc7092f12f75508c7435f96eda606b75612e97ac1073385bc895679cdcae3a27b40b26135f217eff188b5a1e92f9d4
+DIST thunderbird-bin_x86_64-52.1.0.tar.bz2 49860004 SHA256 f25e6d6d54159a65ca4d5bafe45d341a2fe69688067c6aa50d3496688d7c9044 SHA512 588381a6c0a324dcda7634d0fd431f3902fabfae58510b0b1a6787550a70598364bd463705fc089d79d2697e8996e066787dfd5827ac4d2a34ce9f150a3d54bf WHIRLPOOL 04656c260322ab0450d68a4debad354292875cd70f5de6a43dfe9b1de6a63d63c70bdd5e83c07a139dc1328d7159f4fec0fddda9e52f017640b703a66528119b
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.1.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.1.0.ebuild
new file mode 100644
index 000000000000..40d6341081e3
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.1.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.1"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 256"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/bundles" \
+	mozlinguas_src_install
+
+	# Install language packs for calendar
+	mozlinguas_xpistage_langpacks \
+		"${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 0f8886fd783b..0364c877e34f 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,67 +1,10 @@
-DIST enigmail-1.9.1.tar.gz 1736876 SHA256 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c WHIRLPOOL 80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
-DIST firefox-45.0-patches-11.tar.xz 22864 SHA256 4d599cd6c0c0635b23a918e5219c6e37fe0322a4f94484dd8369a599ea3e6532 SHA512 61fc961b5aa015e42907de273fdbd87fd600d1733966fd6d65dccc4de554ee12c82bd314b2e38865d38ccd2fb453c161074253cfb2f49795e2d46a8f206952d8 WHIRLPOOL f5beb44eecb9002eb7f28c172f7a8e3559e85553ecd4fe79733f6b099119faef8552d744db961dbcd5bcc46e83b9070edea9d7de2ece1e717fd7c00489f2f30c
 DIST firefox-45.0-patches-12.tar.xz 22040 SHA256 563d7bbe67aa4379ab0a9b460aa397aa2a8e9d1cadcf776490beb7349230c6c1 SHA512 be9981818e549d79f8557427dd506b9c473922c0043384563c1fd92e4c6c96c91afb8bb01d4499a3a61b463ecf2875bc776fef0f279c0f2fc3625602cb47880b WHIRLPOOL 4f100eadb5aae49731344d526ba482c97dfecebfd20de533e4986e3a0463ebe31853bf1f9faf914a6fcfab82936a52cbda2add84c019fd6ab15ea086115e5bef
+DIST firefox-52.0-patches-08.tar.xz 10084 SHA256 2acdd54fd4268a1a1a12905fb3586981d55bad5269b8f380a54aa65fc4268a4f SHA512 974edc753230429a52c820c82d8b78ea727b1e42a10fcd562b9e4173920f369a78550e6517e32cfea64d19a92c658ef1cebb29c59165fe8aaa587ec20107c835 WHIRLPOOL ab2c1520bf795ef48e564fb81ce812e11e7f4f4a2fe472ad85b045011344f359c62ec0c4c83e4ad196d3d891eef8ef52b462a77b6f1485a75eeabc1487462410
 DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
-DIST lightning-4.7.7.tar.xz 1933692 SHA256 1dd931007ae8ff09601090f7123c793162ff016e0ff494c99d8145e0cce80e0d SHA512 c2c5d4c48a16f8f4286b4a52ba9487e1ae4e9c500708eefdcadb49416e6e687e1f1aa58149839d3e739cb57654c211239f4206a6231c3146e6775ebdf7dd6969 WHIRLPOOL 848ad9a5b2c250f42eca45ca3c019595bbc4ddef953d98f7fab857b0b77170c283dac737943b4dc7ed6e2845bf3f6f19f4ba8c0462b3707e6819f85be71c8798
+DIST gdata-provider-3.3.tar.xz 85628 SHA256 1a1751a5dd3d941bb28051c1d3af5d96c6c06b00c1b2d6b2442e312ec14644bd SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b WHIRLPOOL 2b77c9343437633dc8b26365b6f172999364b81b4928744e0eba0d0de50179fbd845085cc4fbf95a0c068a9b76bd2280db8f9f349ded680686ab6cac949bbcc6
 DIST lightning-4.7.8.tar.xz 1951252 SHA256 b31acd34aa38eff8b8043922794f9ef6e2dc67740e7689462991bf9517f15756 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6 WHIRLPOOL 7494f30e08e74097179de6f44502b91efb2b65cd9bad4f3961678496c1fa376e0f5a77dbff670d66225e49a7ad11f24d8097498678fb128409e9295fc9323292
+DIST lightning-5.4.1.tar.xz 1891296 SHA256 2c7eb418eeb54919542cb097c76af8c61ada1738b30562a54dfdc1091a416e7f SHA512 d5e6197f53443f7baf2c8487293e59ce825bd835870c2b38c64feefcf3a20ee46a41e9c2320f55157bed1a647ef51e97b74efc1d1ad41be34caefc943bfdaaca WHIRLPOOL 5e046c862e4fe9ac47a7be4d7fc3342ccb67b8f76c1f8b542f75a8b81816ef7edff9b478525e2fe0efb7d21eb0fe8cec3ee28185a73338ba59e84de3dd622c4a
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
-DIST thunderbird-45.7.0-ar.xpi 490775 SHA256 b9263717ac4686ef68f7c3cdfe652d173c8329077930c0a670b56e9368e89bff SHA512 5a96206f4f0ad0f85aa9141390c9799256c3a93d6548a649fa5a8eacc7a5423fe7dcb54cb2a5834be1c2b4087c6601b791332fa1d8bf41166bb3f601cb3d66f2 WHIRLPOOL 4df8584d46777331863ae686252126019def510fd762f88b58b5c01c09eaa41e25c37a7da1e1aff635f3a55c6e9eaec84f2bbebbe8fb621965a9e4b10ce003cd
-DIST thunderbird-45.7.0-ast.xpi 428059 SHA256 4a395aed8422aa08d5e40c4952caff7177d86620155fcdba1e106e5f1f3f4523 SHA512 54b5d3140fa407e35ca324f7c3b6802543f0f87c52782a7a66d375cd11bf7fd755de79df6098ccb457ec9309247b6f9ae0a5f58f41f6047ac8c4c8c711627a57 WHIRLPOOL 74bd1495e0094715b78ca13c7ead03d278098bf67f72f87c8914615a926ace12202ff73de43a246ec73353d6624927f02d97ca4449bea2cae5b8e978579f0f51
-DIST thunderbird-45.7.0-be.xpi 469096 SHA256 d4cd4ae47f3c6afceaf76bb12c0a4ef7d314a0e076a4b49a3f2d3bd33dffa75d SHA512 dade7f2ac3d997b745c1556d8a5c73a79fb2cb0169aba3d9fe4249286220f7e6b54a7feb5877d9f14bdb77ba8e3c5a2d6d653f16779c0e628a0bafb18dc1dbb3 WHIRLPOOL 079f397370793dec582665f7b1c4139c1919dad57b4c94a95e702be244fe54cae5f3ded956d0121be066bc566c3f8496288bb2469ddc1d58a5c2ace52929256d
-DIST thunderbird-45.7.0-bg.xpi 524300 SHA256 abbf03b19347a3b32f3681916a4afc2f0999dbe854db1dfc1cddc1f48820b416 SHA512 0afc823f18f57ed2adb3e153999bce89ebf512a907c22c52fde6a7707fab2f3d4c0d456b36ee883511ada05b4ee468b0b180b90750227acee71da47f58a497fd WHIRLPOOL 2a3959368621e4f35b653d9f9dce7c2a4cad544a4ccbd6a0ec079cdaa0c01554568f6166020aabeefd54e29d4ed4993fde13b12b05ea02b72207a1116e9b65d1
-DIST thunderbird-45.7.0-bn-BD.xpi 581440 SHA256 9ea8469452eea2e82581f7b4717a62d4df2215b9958d804439d1b7ebb987d383 SHA512 a176a458ad0ea3d5447ea60cb554f8a5d2158c6224afa3b4c2f238e1fa55db9b96fe84433b6723f3a1dc73702447c5c129fca100d7bb9ac3a22a076df91824eb WHIRLPOOL 64394b19cf0fa9dd9b7b0c45c21ce9f77cafcd112bf11dc7c51b2fd1ac506c9893145e9e417949c48c1729a6750d21fd0c5aa6268a6d1c11bc29928dacaa2668
-DIST thunderbird-45.7.0-br.xpi 466000 SHA256 dcc75714a9bcbc51f5b2fb2b435e003a04dbea79bafdb0579604aaab4a740039 SHA512 5aeaf3359e1f88d5a7ddf19df0cde007320c279b850933c930340a0bed5a054c21fbab07975403ec9068c5db5c7b1922443cd79d5d48e1d0d1dcac4bf30b7fdb WHIRLPOOL 8fda8f8a678eb22a3768efa8d66c3b58299529cd46457765e1bf2f5dce44989777df2cafa808ea9f7e288868726699385e9af3873cf52d6b8eeee59ca3b32a48
-DIST thunderbird-45.7.0-ca.xpi 467980 SHA256 42a261afbf1689946c9f73363d76175ed1a91cadc74d831a7b7d0fbbec1a9304 SHA512 eadadeb70ecbdaf2782f76577e11c4dd3a955d209bd180f12c9235d4574031f2a24f9142e29ca450e64e0e39d0206af120fabcb6fefa3e7ea583e4375da17451 WHIRLPOOL cdb693a6fefc6d78805afad690a7c1f0fb6cbc19a7d9bab40f9799b1a873192e138101707d9d5a24d62788f8aeca39793fdbcae4c070974731e4630b74c704b1
-DIST thunderbird-45.7.0-cs.xpi 474327 SHA256 5165474d10d3256ef6b96f155f84b48874d40add53735f014e48270026e9459e SHA512 094506ffd7c2900c0abc9628d2cb3e980431c67b8545b72e84ed5977c270ca2969572040b5f22321e84aa24582c2b2ffab90b7970a0389868d3e62c53af57785 WHIRLPOOL 43b02947dac144b109d508a1777e76b3e4d322f0aa7b241187fe0d306e8a9744afbc0679eb8b988ebba67b968ba0d7b813cd5569c4be7758c475fbb1b273e4fb
-DIST thunderbird-45.7.0-cy.xpi 456120 SHA256 306a2c570e569bda011cbe51160427a3961d25be54bf556f5ef80e2f178fb729 SHA512 b8f39d50e77243270fe65cfc9bfee2ee85289347771affdc6701323958452dced53077e98d023837d2d26afb977bd932e8cd16bca875d9b0e95bacb710a03075 WHIRLPOOL d4c0a7c637436826d3deeaad025ae6d833a264467af93a781976c0a654ee8eae6c1361e06534301383396e31b1c90262b93b4af6572226178bf7db9c69da44fa
-DIST thunderbird-45.7.0-da.xpi 445595 SHA256 8c42b39a9a54150de2a9369f96fe2274639d241066884ced7905ef7503af93e9 SHA512 bca2f569eb4a3ca22f3bed502b66a4e4fb6b461b1e1b5d35cd01d311057bb038bfca52f590c560ee2e9bb3f274c9151b82609dfe96c42216e8e4989452bcef1a WHIRLPOOL e8543ffc7d95e616d9f5b9f3cb3058a4ce8ccfc958da5e78defe638bcff95f2b5e46c5b99581325011051fbe9c7c0b1addb80f51fa15b0eedbeb64d6fc106336
-DIST thunderbird-45.7.0-de.xpi 451956 SHA256 f6cd5e35c8d2e784a31ba44555604f189fee8fbf021dabff798e4fbc54d75edd SHA512 82f78c4e7eaf7556e0e8f7450e8a4f11144d9d5ed4a0f6bfbfad8e7bc257524338c5ee20097cdb8e21b76e957f235df95c37c4008e634869dde26202cf365d84 WHIRLPOOL 731f39c0bf21af1df53f46ba72d588e95741c57289daeffb289e1cf32c80310b81fd99310e2ac85f5c70dfb2aed36dee2c346cb0c31fc1bcc125cd680ee67b52
-DIST thunderbird-45.7.0-el.xpi 514359 SHA256 84297804182556c321d68ea94482b9fd073a501d69e1ab55f6a654258298c72f SHA512 0a54cc8de70c45665033e08455956142e24263ea08849b5a9d5087ea41e2546c960b5d671f2e21bcfab16681a92a64c3eb27c81ed75df792bc8d70097c6c2689 WHIRLPOOL 6c97b97ce26c026cb61c04cb595bffa5f583c512d30ce262aa77e5c6d25092be0c6220998aa97fcd270c71f56cf86d6a294d768e7c23f8df41622fb2c3684ef3
-DIST thunderbird-45.7.0-en-GB.xpi 437603 SHA256 656315fb08642fb179b41400240028b309d00bd7fe906e22055b9f8ee04d0e25 SHA512 1a3fa43370a0260f866a8736c4706102add7c9d53ae350e131e395b7fae22db68ef7ab9d2f762c8cff02a7587d980ddb442381376897fa78f03e242dcf67920a WHIRLPOOL 4aa15aaf04296e43cf2c243c97a9c231cd0686a014b7f4d05dfe5fce909f02e9b275066a29e05a2a2bc389c9d69fa4ec6a7277e7c5906c7f9ade2987c3167979
-DIST thunderbird-45.7.0-es-AR.xpi 464684 SHA256 edc2c111b004cb455c2cf47602b7c704228bf427d0a61953db12bf3e3aa62711 SHA512 e26b7a11b2089192df345175e1daa61f11ac070b3ff054b5cea1583e31b53215edb7189f7c6e31cde19022696388991299e2d77a8020fd78514091393f731581 WHIRLPOOL f89fbed6f6b6e3fe820b73adebe285feb4200bd8ed62ceca402d985f8bb62bb0342daefd2fea05b34d905e2e55c1436e05c897297aa2c58ef14ccdcf67d7c95e
-DIST thunderbird-45.7.0-es-ES.xpi 388000 SHA256 86b722f645b3f313b27d6be48f34ce08f8d842ad6659e65b7ee3226df1edfbe1 SHA512 e0f8e3bce998d97e2660c8a5803de3b995f8238c4f5dcdbabce377594628e4e11819b6b21ccf3b593f8925e9fd0389898287ae4752a35894c3f747122e824f56 WHIRLPOOL 8529983ef8e063f49c282e35ec8ac1ba0cc8b6ce593cfa0492611552a589747828a47bd0e71d792259a07874200e797b4e3779650c436c4965408ce875e58fd2
-DIST thunderbird-45.7.0-et.xpi 458418 SHA256 58eb2a99a5d595a4ea8ef210e711347319cfa22fa23097c665108965e51b6de4 SHA512 f4005df63644dfdfa25c3f5e8a9ca4309ab4533f3868aaaf8eb72f94713d18af3ab076bef10dba227462d20aeaa18407ff497cbcb6ad7176e5db95198335fcb9 WHIRLPOOL 33b4fe201c282dd6ad73072e79adc807e6f8555f1051e351c1540f1869bd23412ec72fb8d349f36a1faa389cb2b65e6cc5a968b6b0add3bb5b378fe9b33086b2
-DIST thunderbird-45.7.0-eu.xpi 456708 SHA256 cb19192b7854ca50368d4b7a4458a7347bafac3a849c95e402bf9f3a6d9e861d SHA512 e7660ad50f9d82750139f464c05f5a0246b5379535ec44eea3a06d0296ff4095c8fa67151699204e1ba0256ab1d5d96c5f312cfc05881e1cc59dc2da66f85982 WHIRLPOOL 47dbaac8d0b3319df91c27c433856d39d13e4a2886ab4acda307250c003b272010e063fa9ae851f51d432e7b4457e918b106f75d8d16ec048151df37746b187b
-DIST thunderbird-45.7.0-fi.xpi 458336 SHA256 c8d796826c7b06ecf43856385a7e2b238868a5a7f906deb4dcd2f1ef4510cc35 SHA512 86c7893b602f4d461ca28431000f23030729054ad859efdf38b51d6d56c8eef63d29765706e2e5210043de012b68a4f13d6f40f63363582ec52383fa06e72ccc WHIRLPOOL 3e3f0fed47992f76bb0b332a3c668331d5bce2cdb6feec091e4cf18cabff625742227fe3faf647b677ddf834de1486799ea37ec49a2329ca57fe8c7df582ff81
-DIST thunderbird-45.7.0-fr.xpi 475466 SHA256 15e263f5dfca076f48009e80b3c153a940ed9e85a6fcadcc4f2ff511eac6db3d SHA512 04a02a44b824c39eed1c3b8cbd45f7a18c0e7b616f502d4d1eea01ded1b847e4995d26f50192c2e53f2585cb300c68e90f2eafc72e43a7decfb90758ec5efeef WHIRLPOOL a48d274f981124a981c1d38408799e921530c237d31e1692560acd8b72d2c1c3c225c7a455ae640c844fc743d3869e984d11aafbdc7e7e9d2ea49a79c32c56f4
-DIST thunderbird-45.7.0-fy-NL.xpi 464757 SHA256 06e3a9e4d1cc75261e0d9d0f3126184a6c820feed16c30a5349de91b62ebb65f SHA512 18ad3d822b1ea8b9dd277d50a2b7ff408d07206a38be381e71fcfcf3d3b473da9ed0da914c33cc70748235eac9ee61627ebb240b5cbda582f3fd2cd9e831de1f WHIRLPOOL 3395f84aad579a4478c49d2d5de4fa7dac1539546b7a489cb7269aebe54482986336ba944acd9da0f089d2e997c5fbf319b7025d354629e68e0f58046f8e5a1a
-DIST thunderbird-45.7.0-ga-IE.xpi 480317 SHA256 8e47e3ebfe6f3afbbd5e2024c48955c0bb065f1652f58f37ec47d7647e42e80c SHA512 ff8921b3fded9758e1a26ed40ff26e1206866cd2faeb72ae958a68056a6a45b5ff1ffcb63778816110bb2adcd7836138a0df8d096a6205f5e0072621d6c70f60 WHIRLPOOL f8f43b843f2fdb2b3adfdc1a35b2a3dd97f814cfdd8eff090721c479f61cfec7d09d7d365d24d3dd8c17442f111c1e1aff94bd55f49d6a44fc3893c78fe55915
-DIST thunderbird-45.7.0-gd.xpi 478297 SHA256 ca8c01b8367cc9eb767e6a9a6fb15adeffc7ddcb9eae46e84d7ec2cbb25accaf SHA512 882d190fef6a1ccf7bdd89c67628e7798c3c5611cb2e5bc3b3202caadb1923d985adcad809e3809fa645dc6cb968b5564e576c0db58b97856e9257abde6177e3 WHIRLPOOL abad8658ee2536509eac8d664654083f08167601afe145fa6f7a1d5954b7cf1019db3d53ea5cb8fedd0fc2979d544396a9804e42f12c08820b8d1f11cdd311ca
-DIST thunderbird-45.7.0-gl.xpi 478580 SHA256 bf42b065afd7a1db7601b43a391329b1530003c85be4c51246498f75b7b7d198 SHA512 c7a815158c55c4a915f6a5c7fc3eb06ed0b3e49372973d950fde427d46c55636f6b0c5c62da8d04dc23c68b7500d0e50763a9d19661f0141ad5f43d7f80130c5 WHIRLPOOL 28c0b55d72c00035b53bea3514e796a47d1da50961b1cdb6a8f77c18db0f2bae3e9706c6f100c6a094b4c9c5ab51eb05b47aca3b7253084458a932aaab1d93df
-DIST thunderbird-45.7.0-he.xpi 497963 SHA256 6b99205685fd0cba011c391fa277869cd8d2bf457a5bb42e0f9cfd38b873a7a2 SHA512 26afad70602e15a168d86ce0a16687703a833d1f53220fd895dd8ae33894d2b66bcbe32b668b8e8c7b6783f38b37a27360950bcef33aad3827b049fc399bcd70 WHIRLPOOL 5a72a41630053bd5c0fea4edb969528a0326b352fd9b2b227fbfd0401267967b9bad9dcdca16c16650d02469d9cea8eb87039e0bbebbc061b405d49b608c5161
-DIST thunderbird-45.7.0-hr.xpi 463959 SHA256 6af2b5523ac3d81b0a25df5d4e63c18183c600446d469311b52624f6f79d7707 SHA512 1511ee83ce7c8c3d2dbe1683d362d3a5765c9d4d8452f4d03ba6674468308fca89983f52641369e2c83cb1b5ca10489db52dbac4533002fba41e7a870faae346 WHIRLPOOL bb72e430c8e05a2fd7d86830269aa769f3c89d17277b49d61dcc217439430f4666ac63790f16d163ae10cd24a3351528ae97f8f1b3d2cc3de28a9e083945585c
-DIST thunderbird-45.7.0-hsb.xpi 479414 SHA256 7a7d5249e894c4286663cc91d01ebd30e2dbb5ed1f7b89c355be90f0882c2209 SHA512 d9aaed7fe4a9bbf6e2676b080eb32358f9ce100904f7d5b5e0948cf50f8eda5c110196baae1a357c963f632b0f3a39c14314c4d2777f7148520fb2a5e38c42ee WHIRLPOOL a08bd25db77d27d28cece07c71fcb98932458d9ee440675657e9d5b6f779f07d78dad8d841c409aef079564c3b06664a4aab7206e3daef6c0fdc941b9fa57247
-DIST thunderbird-45.7.0-hu.xpi 479584 SHA256 613a5325d0e3d282eff165afaac195fdf7d064dd5ce846fe7533d657daf5dcd0 SHA512 46095049189dcb205bdfc650063da924d91dfafa9e2422034c270525d0f5d51c59fce3b92e849bddeabf40fd23327e813a1712f319edaffa21560b3f637a81e0 WHIRLPOOL b85205dd7862ee94cac5f9a383f966660e6e31ec87a872401f0714176ed790654502aebbd958a2e12a841c84571a46a4476047b03c51dbbfeec0abff81b77a78
-DIST thunderbird-45.7.0-hy-AM.xpi 518883 SHA256 a3056c671b17511f048bb85b667622d4a9d682486f3ad378e58a61bf93de7119 SHA512 4f1c8b8a16ae085bb86ea023e22b6d8eeb21c72c831827927d88d67dbec74a4317c96f81497be145c9699fc59fb3967361c9eb94deb488a572fda2bf71190654 WHIRLPOOL 07c6987f62a8b0aa4fe45532b38a32b275255b3637d163a7bcfe37c06f6a43edd0df7fecc57660ce073726375f5b8dfe819926a6e46da7ee4dcf6a22f9d74018
-DIST thunderbird-45.7.0-id.xpi 499982 SHA256 ccfbcffd2976286ae28b628a1c4b49712b30b5a6cf915bdcaff423db6963ed6c SHA512 894ada8af60db65dda00d6b06afbe9ef6b5a4f471a480ce3501cb95379b91528d66f15e2eadb7d1345dd9cd6b8f7f4b163f857e8cd46381da85ff68c03f53f1f WHIRLPOOL 6fc2b73e5b0e7e413658a30f93503ef271d6a84d0188d444b35d4826f576c7cd1e24ba96c05d4f8c20dc2308a27d4205650090100880962d9f3b77ce8804b40b
-DIST thunderbird-45.7.0-is.xpi 462191 SHA256 a48dd7ac45e703d9f42cb59e72896cdc31fa56aae6820a26cd0575c0e3a534a3 SHA512 89b6a53b041a6524ee727489cf13b5b77146a36b112a77ed21a93ded186b231b55ad174825947808645d9855123658956e49d99f94eeef2bbcdaff0d90b5258e WHIRLPOOL 5d42e642c6b60533730005b5421247d6bb0b08f109cf72cc84a902750871fc10ee6f3335877c899a519b7e45ce34a66e705481e523cc1b96c92af68543eb58fd
-DIST thunderbird-45.7.0-it.xpi 376889 SHA256 91526439b690ef64cfdbab9a13e0ca905715ad4575e769f73eb9cc19f5b7c214 SHA512 73dd8f500a47e0abc6c810a7856e719880d1eac078a166ee8ae827570ada59a6a83e1ff539a43a71d1c130e66858a9094a37b975ee281f4300bee44bdd3e724f WHIRLPOOL 0b2f0f61225c258b2ebc6a055fbb198e3502b1785c983cfa0cd5638b6e46ec27d50f48dd485cb782329c5bd3125c607c8f6658fdfb7e3e6c06dd53c5eddeb5d5
-DIST thunderbird-45.7.0-ja.xpi 519552 SHA256 7309971af660f165d8e79130d242def0009b8424d4fff56e6ef5e88c296c14c6 SHA512 9c50f7ce81466aab091d8f65cc0066be6cf614f18996301e7f0bfba9c7c3096f0cd45a918222c76e4ae30bce8a3ca28c89b703f1a819f8f5de6fc9c1f0d0de14 WHIRLPOOL 07c5d6a306647373901ee5332f318262bb349f06be1715067f0d553be3a81dde6720fef3ca8fbfed04a68481fda7e2c464866c71faf8fd3caec21464996b6985
-DIST thunderbird-45.7.0-ko.xpi 487418 SHA256 d396f5155005ad84b49540f428a9c4580960c1faf3ef05ec5150d205cead2385 SHA512 73013f9aca65f23ea54555aa9b6465870fcd3acd47acc049a93a3d269d1ce005b1c5a8437a83bdebe27693fd85c43129478909c82c137e97e49b678ffcef8685 WHIRLPOOL 3466c5004121e2cbcf4a91c01f596d4f96d465f72b5372215ff0b4a2f341f3746760e658311b0ecc0fcd78fed61d710cd1a2ae186e8d0798394ba36d8ea46b1a
-DIST thunderbird-45.7.0-lt.xpi 477736 SHA256 7175c9ecd7736ba5ee8a0ca2910936f6893f983921f65423c8384ad033bddf0f SHA512 58ce6611ce084fb21438c124cca7156dc61db212cb641b271b16513e5e42450058edd8686a37683e61a95adfdfef5be77adf7875b167229f41bc4e92d7508879 WHIRLPOOL 8a05ae2c078a02ea1c3a7fe012b89cb7ad28d8daa26aef89f01042848c0766f78b33146ce61e0567e239a38e99e7389c6c9957edd9d81e7c5f82927df9f2254a
-DIST thunderbird-45.7.0-nb-NO.xpi 460011 SHA256 8a9ee2d56cb15f7c13828044d4babcd27b1439bd122eb4b0545312c3deb58393 SHA512 88e69f0b9d91f46a8c4a58a9d130e4039634da19e1934a2c7f7332bfaa2839e8f67cb5a4660070fbee459780e7890bba05b78eafd3de62c54c1dc009cfc8f8c6 WHIRLPOOL 4056d4f78549e15fad510d80012a98664931029554d76d3b5ceef4b64442474321c752221997ba7488885cc7a5abdf38100deacd9f1277ff8aed2fd6dd3f9275
-DIST thunderbird-45.7.0-nl.xpi 456664 SHA256 decc60938154a8360da5c2325879ef0c186a862d01f163fca606225484d94d5e SHA512 1ccb6928010278e8c00fd5f77a6186e9fd7947ac08b1e3facae829319c6f25530372f03a1d1d97afaf4193b3fc61371b42bcbeee9a7c6fa98c9cf586a04fe019 WHIRLPOOL 94def101e4ede201cfd6cb41abbe8a6dcd6c1d4199b631c9cdf2f7d9a42bf5dece77c25587ebf031289cf93b4d497b2707898c57a83fd7c748378d4a5568c5ea
-DIST thunderbird-45.7.0-nn-NO.xpi 460880 SHA256 202983f146cb7a11897aa9ddbca6e7207921e4cc20a8164bf1393b091ab6dcf1 SHA512 145c982ce4c6c8879a263a70dd7e7a4f5c902153327e673f92440f2e1b79e4082d75be091a97778451a5f3034c7ff778a64d175f87d24b3cfb461b2fd40d78e2 WHIRLPOOL 40104c088b51474018f6e46c6e070ac513e56b11f3ea8e88b469163c50fd9d3a0c34874d41894e9faf93e52fe9705121189d1b23883fe07c8a93985510e6f7b7
-DIST thunderbird-45.7.0-pa-IN.xpi 551068 SHA256 a14daad30f9b68eb5785cfc0737d525b7b881b048043640ea1ef4e9297e5f745 SHA512 c70b89c315df2178a0b21ab76993144a44cd96b20960c15e19739cfc9e40420e9a2a0c0638e6ed9aa4d0ae535afbbdd5d2247d7f00a7b58504e563028a4d3c0d WHIRLPOOL b0d6e22b80bf0a45c92208c567edb20fe20df71b0a58186f70fe083ec4ef736cdc32d816556eb146bfc2dce6f1205965c7a728ef15895b3208b52212e874240e
-DIST thunderbird-45.7.0-pl.xpi 423867 SHA256 f99d837041bcd06c6e121c20b54ae77e02b3714d8d963343de3c8f50f77730d2 SHA512 45f2e7814617fb67584c1cbb6c7bbd7ad2866454f4b36f4d9822852daf56a5a0fe0b8fcbbf1c7f89279c06aff6af060731ce418bb0b5dcceb3bf843ed6ef2771 WHIRLPOOL f723b62488c13e49d1e0a5c14bd9a83328812a2db171f8b54b1308e2b99bd2ee4925f707011e6e5dc93124591e76febf3043aff3f7f0b3001acd9a95fc58266a
-DIST thunderbird-45.7.0-pt-BR.xpi 464682 SHA256 0482cdd42540ca08e8d2d4ac74ec9a45120d8131a86a352984ace76dc907df23 SHA512 6943c8faab9f51684a6618802143002fe500c05d885a31c14fd9feb08c8c413ef6798cb79ac54d2c9e0fd424b27ac1e14cdbc5359a4c852a8dd3c6200a6c7592 WHIRLPOOL b5480bc69d822657159a8438f06f936b9d81e5c53d2fb7edcb454f8b2436d515267694bd14c1d474932c69693d9d2df81446eb6d549c2e832dee7811e5071879
-DIST thunderbird-45.7.0-pt-PT.xpi 463751 SHA256 65eb124fa4592ccfa82e96d94390e4e34fefb6abb7baf2d854bc60d545ad2e3a SHA512 432ac66229bf78418bf3ca8762a9b6e0a1f543e56c5ec11a874559b73ad8c3d9c059bf9a5cc3b3d733ac40833071a38d3ffa11aacb68fa190734b3c85fbfecc8 WHIRLPOOL 29d04a8f086307903f287c9201f9e2f9ea51e5d2bf499c91a170a9e3e9bfcb722052833491157995f62e56f37067594752aa3e97bf72080aab55559f904afa24
-DIST thunderbird-45.7.0-rm.xpi 462650 SHA256 3c7b6ef80373ea7c80e79732082a6c219a86aa7849827439b6c105f783e17cb5 SHA512 70a2ee5553812fc4ac2f08b2c19eb9a90a5c92be451e49392a052608ae59b61035c8438a0656ffde3bf5dde4aba0e06ce92684f2944db8dc7792889b05aec9f6 WHIRLPOOL 3a3db7a2984c148ee40609bb17a3fcc4de4030db55a98b58a4906e5eb8b4a0bffb986d80e4e56836b1726f5b943ec8279f47e207a7d753d39ce09798f0b44aad
-DIST thunderbird-45.7.0-ro.xpi 468518 SHA256 0b937c7fff5d59b0196cd57ed434471087f4ca8978650d36898f152ddbbb2956 SHA512 8937e43bfa3171c42f2dc5b5724d87995c8366b58a69360eb8aa0004244fdfe01b5a6bcfb7ad85667099211323d035fd1f0cf77c064fac02db3ff731bb95fa2f WHIRLPOOL d2c4b521797b6f2737a9b4f47e37c266827d7eb65d61a89d8046563fdabe558039fac6e4cac8197096631be78d3d29e2d6cb13e52fe7880d5c85c0392b058862
-DIST thunderbird-45.7.0-ru.xpi 463892 SHA256 a10fd70759115282b2af3a593442a07b5d47ead25d3485cb7972a7cc1c7d3137 SHA512 6536a629f3c30830c86b7e3e598e805b4bdae3b5e160f489bd431dcf718ecb2fa796cc4f36146e8524e9e181264e316e35c810a289ce13edea83c3d22c63b7a4 WHIRLPOOL d0cd65dd97888ce4cefb507b7b6945c0624474d9511a5416012baf5f57c34d5d1af48a24d180a86307c27b47a8de28c8b924ddc74f9a468effe4af9e1f2204d1
-DIST thunderbird-45.7.0-si.xpi 555996 SHA256 edf2437535a399a15a9dd4dd16983b0bf783a3c24ace58a5e844824d8b6fa93e SHA512 fa4daf1afc7a80b7a0cbfc26733f731b5a2897c9d8df204e183ee8677a789ce921322c7dcf09f0d3e77a1b045dbcc117e3648047a589d7b7d05ebe5bf59d7b43 WHIRLPOOL b5c33e01af7b921a7cfc9104c3795465a8dbef605e8e0c0a3ef6443f0e1b8d6af16c46cc33d478998ca041d7d077257c9c05e6d14b1fd277ec85a5f8156ea76d
-DIST thunderbird-45.7.0-sk.xpi 481492 SHA256 8a7c8455d2279563fc8e4cc11481be5b9de283ceab732a24746344baa144322f SHA512 7a4c2ad467bcae42a89f02003358934cfd0a4dce1acef4c8712ac91b3f0f961428ebb6b9fd806e8134e4b9673ca7939a8892bd0d9681e431f7b8d2c9c13490af WHIRLPOOL eb52b793c4f65a74127e3937a133534c432679e37d869e5188ba1b076589873c9e6509ae7e6cb24315bd0b134a9ea8ce69453679922da1b3df61e8c1b26a3f4d
-DIST thunderbird-45.7.0-sl.xpi 462781 SHA256 458746ae7514b9dea4aa9f6aeb3e306e7f0b41225d52d088bfda5d15a8df17df SHA512 8fd31e3d3473cf8dc9ac09a89cdc513c419d590992f8647b7deade1787b56519b6b1f14df54ae51aa3512ea6c12c9a01b43861744767532667d32576923f33d3 WHIRLPOOL 055130b227572a8b0a74f5a91794c341dae61109944de32ef71a37f163e58d86d0b4dc113bb1a0c4b8208655f1ea48f23a5e40a829aae0d9f212cf41cf6d6509
-DIST thunderbird-45.7.0-sq.xpi 469535 SHA256 1a125ccd06b46d919a4a54833243525cdbd245bf7ef80bbd631ba8fe09d1a78a SHA512 3fa30abfccd946980ca4a205b876f1be7a671378fcf19c700ca793ad1cbe9bfe6709be621a6008e6cc096a81606fa5afec29ef299b4b324407e0f6fb50d32835 WHIRLPOOL a57708f75b7daff0e038aaa50d47c20977ea762c1aa74d7a78511a306f72b4e1119d8987e34fb396faf867b833dd808b768d2c76a01e0c904575d06553e3a69a
-DIST thunderbird-45.7.0-sr.xpi 565466 SHA256 70cae2574d8e097774bf6c13b1fb8cff0c1ea00115483850706bf3b552fc49b5 SHA512 d522ef159b428f2fa9dc76b947a91c6f6cbca4831542d823ed089ba0d0cf65dee7a0ce0b1c22cbf92aeaddbd0e472f9cd5b87998741b50830eed323f56925f7f WHIRLPOOL 8bba0f5eb46ec511ea0d3c831c369d8e9cbf5aa56712028a8c38dc0781dc819ad516404037367a55721cb2f3297f8176c8a93ec5bc715d665284f59bb3bd3ccc
-DIST thunderbird-45.7.0-sv-SE.xpi 465434 SHA256 efaf60942170e5ccd1d385c1278638bd8aa91bbc1777e666dcb8cc61798acb73 SHA512 b648960ede48239ee86e483116a8be2ae5c78bad27cb2ce8b0b4e2a75b20f9d4f1d3029b03c107df8bff7cd0d90b281492496cd376bfb02e7f39a8ba8197d653 WHIRLPOOL e595663f3b55513a85dc007f88a2cea4c77dc51fe85f61868699dc1aae1de70881e384db3cbae551ba7246615f437fb7d68a755fc55ebe3db55d20b4807080e7
-DIST thunderbird-45.7.0-ta-LK.xpi 579219 SHA256 51e0ace99198782eed52fb95d44c9d9da62215a7cc1f5e15a46984981e3ffecc SHA512 06d6fd69e118d9abce6021e61cf0e21118afb25675073b7af6fa7ad84c05a3ca942ced68bd8deeec8b4d2d2f355fdb28f14ae22675418bdab12ebbbfc05b43b4 WHIRLPOOL 0c04fe270ad77572423a6c45e74c0e36125c496bb0eb56b984e1d5186e2500ba3fd4df0aa9506f7416036420089bc5f298cf0bbac924960bf8ef89c8a284b634
-DIST thunderbird-45.7.0-tr.xpi 467622 SHA256 1225d71bf5fd6f2fbe0166a4189d70594278179ee8a949e74933b01fe4f11b8c SHA512 2cc25e0418281bf2f26e2c252eee2c2df0f0d00ea26b7cbafa1de716c65449c741165074bcc70770f94233946172f083babc011a7360e8b82e6adfaa986d65f5 WHIRLPOOL 5ab1e4d9151b01d563f78aed12110763868ef971b6a447ea63354c0a0f4ad284c2e1200e73beb6f4971181f2eeb389e17f0e188433733b3dcff8c9d9516a7858
-DIST thunderbird-45.7.0-uk.xpi 536439 SHA256 ac0f1cfebd0990e7b9ffd6f0288b92d5909401121997b6e1c173c34890487ab9 SHA512 45e7575c1c88dcaa40c159748f4804dda1ca49dc9a4e130142d5a5384fcc7e4be517a92a0e34ae904135608019313bc4c1d824b6ddf4a836dc4ef93a33f4fc91 WHIRLPOOL 009f7645ca29eee5abd781019f011e62c49e935c4987efac7447062a2d0d1a58704157f9a47980526db9b8b00cbb67bf3181abec9ac03113efbe3b87b5a0be90
-DIST thunderbird-45.7.0-vi.xpi 540499 SHA256 defc6f3d6f77ba8b46e41c3d9c49d42e738c401446f585f55a8ca102116d7f76 SHA512 aa506f2b118e7ccc5df0f9133f2de0347c716da2f1c776e4b8595ed6767a1343be9dca399a7832d5f22251cc472368db18b238141230fccd9f2e1b383657c362 WHIRLPOOL d4749b01578ba0ab43ea9fb8b15d9bd4ce5839a9237c2b6c4c91b9fc308a8b7013d6b211f209dcd880cba7669c440fc3b1746dfcb961c4e7f5c8d5e49b3136f2
-DIST thunderbird-45.7.0-zh-CN.xpi 489210 SHA256 735f0ad45ac48af7db435be430704b0d108dd7576c488c50e1ef015e2dd39fe2 SHA512 6c7bca994437d9fc3e3186ac1fbd4e7eb7d8a0e9257d54a0dd812ae0cc49e200066f5b4fdecff189e4fc3e1948290a1ace5b6d53df4385094a73c31aa6574e57 WHIRLPOOL 7efca0effb84dbec578980c541dd9594d34f416c7b20c6f97796abd6b563cd686b85966d5cafb8a5342a738a65912f0e6335b12edb6306373c84c20b7f8482f0
-DIST thunderbird-45.7.0-zh-TW.xpi 490850 SHA256 f4e9316987462c9367235d75f2d7a765068aa1080bb87fdc62988316b859585a SHA512 a37c073a77a46a16eccdd6536db195bd00eb9973d0307c021dbf89d24e4c79f12b556967bb1a35bc5a5660fd30e2f8682248aab02ddde26700261bb642b5f496 WHIRLPOOL 92d346751f130d0a2fb1c71216cd9bef23602aa90f328ff73a105e1e875a53c8a0704f06732894a0672646d95024e5678e5f0a4101c90d0eb01e6c2cbe75583b
-DIST thunderbird-45.7.0.source.tar.xz 201088460 SHA256 1366cd7fe246bdf1540203586ebfe8fc3fec1f679bd0b61e7e95288f493775fd SHA512 99cea54b553158c1e08cf19157ac2bb6822fd1fef0501d36f983e6b8d4f2143a2e6124d61297446944033d3fed9326fe0f12ca45db0b5815be71a0777e73ffb0 WHIRLPOOL 3592320fa2183a4c25ead47c3f9e4c23df2f723c6a1ea43d95b37527646d9ae7daf3758a9a1532ddc1e3241875482554d28e9c667826d24aab376cb43b8467bf
 DIST thunderbird-45.8.0-ar.xpi 490775 SHA256 4b8787643041672aad90d1297eacad510ec88d04461d19680d38e004add14f21 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c WHIRLPOOL 76ce6c4ff429fe4cc51f87f297ebead9962503ca1fd68c8e0783c43d9898bf370b00a222b7b17f1ed191f30557f9181b56019dc6ac3757fc08fdd53544039864
 DIST thunderbird-45.8.0-ast.xpi 428059 SHA256 0ead56ad0cd11503a60d5f75cd181c0c85eb7ccbc42fa69c76d3cd64f29a0cd9 SHA512 eccf877f29099445ef59c833929a50df7424aa475b1ceb432d6c10b28c71b4e25d840a4fedb1afb3106896da0afeb47a3af1b763553dc6ae40f7bda5b0d65040 WHIRLPOOL a370c261f19a1f1ef3da37abc7665d8f1fb0ba1bdc75e5f11dc923e08a0c7a0b891e166cf99273222d0aee92a4d8a06f38ebc5168c121c391b53909cd6e79690
 DIST thunderbird-45.8.0-be.xpi 469096 SHA256 2836d2485234e541fe2d227af8f8c477173051d6bd6a9db5bab6c64a74fefd04 SHA512 76c758a68685f974d174f5787b72e5f1955ba9be00c305e2e1b1adaeb17e4e7bc765d1263d6395cb89656112c936618d84cb80a7dc860684d49a4677638eef56 WHIRLPOOL 6413aa5fb12931034ebde044f747213bf4da53036b5af9184ffb1c61d6822810669561e8290ec02c016b2add1e25a4a57469dbe42b91384eda6980edb70c9a2d
@@ -119,3 +62,60 @@ DIST thunderbird-45.8.0-vi.xpi 540498 SHA256 39f64a6acdc7c916ab73c279db67f0f51db
 DIST thunderbird-45.8.0-zh-CN.xpi 489209 SHA256 05f2e3d25501ef42422e9e2624f15ea61f48a355148d867c29626af1b09a769d SHA512 346e15d8bec51831c2205a653e84735abfdbc6db1266a8545d138ed11f492d58f3529fc15870eac3c7c28cc60300de2fde85b6927338a2c8fb03ca90449f8a81 WHIRLPOOL e00e1628bfc9f260f40f554ddef9da7a10f16ec7eff86f9d9602f2915c265174009e2c45e8fb862454aafb3073f4ab88fb3a2079acf62c3c36bdf42272cc9968
 DIST thunderbird-45.8.0-zh-TW.xpi 490850 SHA256 7de83d5ec93a97bfebe8a692313998c02479c8bef705983d3f976360a4a02094 SHA512 0b473f3eadbcc63225c5f2b90d6be26d79a139aa72120d45dcfad4a22a20309f11c4565e72bbe9281f0ea0fe508173e046d3f747975f1619f6717835361ab70f WHIRLPOOL 20e7590e8dae3ae07e4823ff855964cefeb479143e7761974c715a214f2b48f9f957a536fc2f300cd3da61d8464c073b0015ffd9576b6e3e6998ad7cfe8112f3
 DIST thunderbird-45.8.0.source.tar.xz 201199348 SHA256 743cbf4856ad460a791f6b17bff175053fccec2af1edd8e8295ac6fda2634c28 SHA512 f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb WHIRLPOOL 63345a36e14334ae33848773b48d19b8416c1df52bb21c36408bb1f34d7fff3a0eb60ac1d00d8019f5af6a915b08bfb7d40989e16e8c07ed9d94de86ace5a043
+DIST thunderbird-52.1.0-ar.xpi 604235 SHA256 cd1d424120449b922d970b3fee89d753ae231354e4181a4d4700dc807504f6d1 SHA512 d23e9005a3e8bd720eb647e4d964495946d708e84afed2c099b417364788aaefd2ef5c4c14e2ce69e97d62b121f2aef8805cf2af9ba12220800ea21e644fbc23 WHIRLPOOL 3ada5c0463b06e38490b47e4ec71181d531c68d7f5fa328773954598eed1a680abb7cd25e6b91a78a06313dbc7bda1c7a63c35b491bad1658d294f9f1faf8f90
+DIST thunderbird-52.1.0-ast.xpi 541172 SHA256 d920be2b1070c04a806745a91e15ab1139d5d2e97480755dd62642bc15222c40 SHA512 c2294166f33f34b59e1ae6873322ae9b439d5315c2aa896e101c7169956a92059e85248d096231c15544162d2fb69e9e6a1ffa126697a441bdce66564e29f223 WHIRLPOOL 38118dddc6eef5932791e2960b52f9f435c3612303341e3ba719b15f2242259d61f3a9f78506b01474a3afbfade531e5b61ce02b949dcca4d3992bdde96d9a27
+DIST thunderbird-52.1.0-be.xpi 570931 SHA256 9da12e3f1b9bccddddb673c7e8b613badecd2e71b28aaaccf16ea6ec4a64e095 SHA512 24ea71f32f033970fd0166e49ac0598c267a50e7ade20948392cfad82d4774f1d62df6c433f360e52432cf74b1e037bbc48a00f02a34a0b3dfe3a91adb13b89c WHIRLPOOL 3d07f54fda9c689ef6fd127d67034f57930817fe501311a0260fd30156f2582cfd6ea93ce2a6690cf9f2e184a73c10a88318f6ee4bcc31a4ad587034ab40147d
+DIST thunderbird-52.1.0-bg.xpi 634897 SHA256 151a7deaddafcdfd704abf7f933daafcc1f1465624b01a856f7c0ff02e3b8701 SHA512 eb47b8a1f74ee72240bebea80e13997aeaa0fcc40830f7e368162b2f37338d800ba633f82f2e0320bfd3af70fd8b39abea2c8a851e651084d87d777ac61250bf WHIRLPOOL 56a9328619d289ed6b201d9e91768788f1762e50db7ee78a47e11f4a67fdda9633671d702ae8ad98237dcdc4b84a627ceefa3524011cd10689474d8ffc232cec
+DIST thunderbird-52.1.0-bn-BD.xpi 676900 SHA256 f281a18cbd823db0331e351f02543249b90d414f9146579b52d45f2826463403 SHA512 745246a0ff5feb3be5b314cc2779df630c8d400e09913b101e875b4b4baf27a5998f6325bfde700c40fa009073bb2d537d6a37ee1051d45551918ddb5b305858 WHIRLPOOL 584aabde71b51529529af4c006f85d1fcbee32d843cb505128c9fc9472caecd7f49ed092b9d132719438f2cf132539a2542df0758a0dcd1c2eef99a307c84ef4
+DIST thunderbird-52.1.0-br.xpi 559380 SHA256 b31c85a62f99cc6f8e043f52b16f977124f3ba89a0539b064b0b751910496689 SHA512 692b658c488adc4a10c60efb01bd08ff58699af8e7dadd22ed22e17f3702f306ff753e372034c5839a62a755b89971d51bb071b566de0a562df36ba000f4b4bb WHIRLPOOL e4a2755bb8229e19be7c4dd61bd3bb20e9fbd8838c38646e8beb2a2b31d400c0069189ed98bdc99d18e950748358484d2d388549e833664b3e51b408b74d0f5e
+DIST thunderbird-52.1.0-ca.xpi 569909 SHA256 5bb06005edc6dc5cad1836abf4bf2a79a71912a841ea5dcede9ee04c50410e3f SHA512 90d0e8c282039657f4a7d7c71c095dde77c3795358b1e49d67c29372e662ffb3a342f4de56a4403e0c4273032ac0479974a6efb9943c2d0fbc1cb5952728f770 WHIRLPOOL 665982d300fb9fcb6dc795a6515347455f651c768915430162bccdcd76212c033c434f7fcbefd7a86f96c21d7f4dd99d4e8f9b4d6f18a70d5bbe407b36dfc317
+DIST thunderbird-52.1.0-cs.xpi 579149 SHA256 41d2fcc1cc5aed3f6036f6337bf93aaa9b37a32e99bd9145f4921a6a927b451b SHA512 b6358df8b3ed70c56d3e55f4a546061480f4e0250b11156987c7a3891d9266837db1b2fea57f258ec08d9337d11a7e368e1145ea0a873e2746e51ccf1d53c0ad WHIRLPOOL 94240391513569989016e1a0fc30f65c7f2041c7710b2918c7ca6a3d6224e04574020be326561a2b4f7c815b9248dc5a3caa1090dc81d10020bdad5d4d2c5db7
+DIST thunderbird-52.1.0-cy.xpi 554857 SHA256 28321a38846a06bed47996fe5f68c5579baa6c8804138866c307df0d26147fd5 SHA512 2cb7bd0351cbe7b765312db4dc66813e7b8d12d1180d8affdd3d1eeb4d9f9b24c9cec9243a5a07bc023a4eb603878614e5c71080cda9ec8199df666360a9ae30 WHIRLPOOL 9588f113f1c57c0a257029d7ba616b29d60510b72d48af74892fa268dae546b2496209cd96dada95ee49853bb4736eb01e767fb6fc892a41e7d8a9fcf9233722
+DIST thunderbird-52.1.0-da.xpi 543334 SHA256 ee813026f6312a6f11572422f0bdac9bb866eb820d8fef917bde943747df18c1 SHA512 03fe662f42e15c049d212e7a5db23fc18774267d88b058a43aa11b92959ee52c522cc7d2a8ff86cf593b203aad9b86e209da85c13f751bd64594826b4a6fc6ec WHIRLPOOL ee9bf7661be6e86cc862b340c827dee16ec9969cc7b35d3480f7f37e004025753909b274054ab74a0bb1a27a681e0cb4c27f483b41779403555d9a14db319a48
+DIST thunderbird-52.1.0-de.xpi 555743 SHA256 bfa9265887d64317841f85222638ec901cc95ec230670994f2231e65d4952836 SHA512 15d7c44b1e7fec2b58e15a59bc54671a698f311109dd1d2cabf017e0c03aa92c71d30bdbd33d75334721673a46fe597da8b7ea8a9eb989fc4ced3f633e9dd4a0 WHIRLPOOL 93728e0b578bd08c47cbb3f3d91d5a1901674a2e0173f5d66997244191c43eeed7b1f5a582868a3ad0f9fe609c5b1c62b42bd6c06ad750c74fc52521004623aa
+DIST thunderbird-52.1.0-el.xpi 662964 SHA256 eedb7abd583f2a4b7a61f81ad79d5ff02159535faba07fc30088776e75837207 SHA512 b8dcaefb514a9fb8571fa40b8968d11a0206f09e5f6770f7bcf4f0edb9f09a8cebda1a1e0e34941bc94acf66fc6c43df88dae420b8e2a5b906b3f8f03ef62b98 WHIRLPOOL ace05a65e23e9422edb73635f26d4cf4e13a95f65c5a83fe583db5d972fa8398693846add1be4aa69972e2e90d78d51563ff4a444c6cfc51f61353bb97fda013
+DIST thunderbird-52.1.0-en-GB.xpi 531233 SHA256 b916e3be5c5529e321a8defb0397dadc45116d9d06378e86d7007d7babe9fb45 SHA512 7e745b7b5031ba74c1725fae9224a8ab41adc97e43bb31208cd29e23f07aed5f2843cdfb0b58a7d534d1e54e8bc340e589bf7e1eb95213939a1bcf2822137b45 WHIRLPOOL f261db4a9edda7c17ece9251f53a6e46c142517a7248f1ab8daadef01048bf9e4594fc231f1ddc96d4f1dddd547def0a6ad278f188133291562009361c8ba3bc
+DIST thunderbird-52.1.0-es-AR.xpi 565995 SHA256 1140407c98f609ddcfeef4ad9a3538e3c68da86b3fa8a138ab042453e737645b SHA512 2bcb0651031ac70b9951f57871b584f885d996003b73b8288d2dec4e218be162e0adf6547c29f2364e1861dc86a580393adb8e377be9c357e4642e86f02900d2 WHIRLPOOL c3227f0d703898fc02629767277a8156593a4c9fd67d8b18c8122226d01174bf81204bece4434ae7204e8c222b13ca0cadee7c8c2154cae5d9fcfb58a4f792ab
+DIST thunderbird-52.1.0-es-ES.xpi 445464 SHA256 1dad4a61a98a594304708eb8c3056463b07482210cf404a1cc5ab96736eb9c94 SHA512 82058c06bfcad1cb0bb96ca40cccddfe459ca9980cbe3fc5c83006ab4eac01fceb22b4aa1f180f9a7523439a30b990cef4054ab3449565d732b0b7bd27eb5cd8 WHIRLPOOL 81b53da8fb29e3db76709166b9d13c561c0b6136bc8399b09007a5f93636155a35b05cddf723a2729e524c869c1bc443e5462ec0a0b806d03e59046e9ba68e26
+DIST thunderbird-52.1.0-et.xpi 551660 SHA256 b54d1f3692b492ae7792ee42ba6c15e668e3ea76021496464feac0414bfcae52 SHA512 7a558b18cf39efd334620219a827e342e1359ed47e1366d43e9e95c321e8bd6741d40042eaf73c0501b7aba1f86204544083ca513e9180cdd0953fb52fd5dc7f WHIRLPOOL 4fb90d872cefb426fe82b17ecb11e866b8a9db40ce5b89ed32b47485cace5099c8b2d24fbcb275b04f521ba67c07e5d00eae79bb3aa9043ff10c300ee00417d7
+DIST thunderbird-52.1.0-eu.xpi 555536 SHA256 552f2943a37ec9a3f997d904bd5b852d7cdf9977f0b8fbb87b511662f944e986 SHA512 2bdea0855d8282c20b484c3dc83db584b5284fd579ec21466fec95a62aecd98cc036ff6038b520b4f60c826dc8f96bf98504132d0617f302f8f6a36ad0af8060 WHIRLPOOL db613a525bf0e4bb71af7881d2e0c5e8112332087b921270e55dfd85d1f0b228468b5e2913ea18fa2de96fee8a02a7d7501d6ddef0120d7cc5f100242cb47e21
+DIST thunderbird-52.1.0-fi.xpi 550669 SHA256 aeb4bdb8cd8a5e1933b784e16ce121c6653b4aaa05c2c6f9b056309933521475 SHA512 b74cdccc3c3b53ef2daec49ab08f645a3c55a43b67a80a6c90733aa3c2af918c71807ca48caf568d121eeae8c5185c2bcdca301390bcb266ab0dff77af35a50f WHIRLPOOL fb11450fe98848922ede46e6225eb785fed539b1dff65b0cf7869e5d2bfecff6f1a890017a3e05c1dfab541b004351b9c9e9b3e82b9a4e6f3a29055d010dccc9
+DIST thunderbird-52.1.0-fr.xpi 577560 SHA256 f41fde901cc9210967ec39e3d258ad568d889f07a1f2fb1e10747ef933631cf0 SHA512 053c4ce7a6a035d8457ccacb012f1a4df29384d7ae10a06180413350f58b3056af05b63b9dec5736539b76a0719c05f6649bb600bf41c3e60a21a205d7f7cbd5 WHIRLPOOL 82c66486a154146a8d81524c98604d1b843d9f77516e614cb5e4cb212a6de22288c30c686d51c2517378e50f5af355f37be42547ba02143ae21bfcc38a6978b1
+DIST thunderbird-52.1.0-fy-NL.xpi 563631 SHA256 a7e856a42d8e021f1e1385857525e5ea751ff143ff725aa15eb6e1c6b78c76cd SHA512 c9b389bef0e84391863bdd06f0da3152e0f0b111fbbe10ce6c744c473a14546d766510d7abbe061c4bdfd9ebad2977f077decec1472f5e6b1ebadcacab7a7999 WHIRLPOOL b98d4433344200054aba05a5b0c8926837592c6296d19738920b0495b2b55ecbb79a37285b9fafe6e335e43470f4ee23bdfad50ef5ab386bb9bdc22781d73b38
+DIST thunderbird-52.1.0-ga-IE.xpi 583555 SHA256 78aa1c4f60ffc943b4541d8ebf08a9c804c7f8c0dad3264e6f09aacb1d5c9e74 SHA512 a5396e26b6f371ed27865085231d14c3d83b748a7647aea8e4eb1905ca901253a81969c57263c167b69ef695d37f7344938d0f10ec058b48ca90c640f18a1675 WHIRLPOOL c14c967b4c09d53886a2e2782d0a24c8d97d1af008663e33830edf65a02d312f8e5782fdf735789deff028677d7eadb8c912d86269e8ce9a300dd3dd92cdb8d0
+DIST thunderbird-52.1.0-gd.xpi 574064 SHA256 d27cd41dd6595ee588e18ed10736d84b2587f192b84efcaa99a172c055513f11 SHA512 e8cafe28c0c0395fd8c355cf54bd52934dd614f3093f7535ab6217bde9e4cc24eaa479b8b79ae186bd055baddf3853a58801053e82d96f92318e6c39e1ede51b WHIRLPOOL c087b5a9e36edc605752eb39f56cd7f6403e275357f9533e41fc66c02a48918404e98065b3c0b7c9e535b1058b1fefcb9eb2a32cf69a75f988fdf2b95e4c4532
+DIST thunderbird-52.1.0-gl.xpi 575150 SHA256 8ea7ae7a48e45854e194ff300510a7f10fb064a68bf0c9fa5cc8c54bb860fa44 SHA512 73cdd21617b534f7368a99999f295e85b76d6ce1733e017bad64dc2a938744f2410c32868cd529d3224505bb0dd96cc3ab785afdeecf492a48fe1453f34abb05 WHIRLPOOL 2706aa4f1b946de4c8fe735e5bc2026a573ca555c1e5e78bcc30e2bc9f23957e8e24795c89a74e1ccd434d5bfa755b5778609b1dd0728cee725425cedae29fc2
+DIST thunderbird-52.1.0-he.xpi 592565 SHA256 100b0da1c56554c496cf93f1489aff171a6794371e0f2336206f408dc5dbb862 SHA512 e88e5ed28a0d0bcf415fd67675d5540b21f8d0336f15356fbf4caf99b98a6b4ca0171cd4eccd1510cde177a57821df9e329d11c91bf659002f256f8fcf8c8ada WHIRLPOOL 38b66c7007bb111cb7403b20bfdd8b2d8ecd3e7abb1843dc32cb7826812177d99466512cd3021ca6c26fd4ff7a29361399b456e1634e948f2f15f56a8b42b32b
+DIST thunderbird-52.1.0-hr.xpi 564779 SHA256 5161640824d3cd84dafe08f7fef762dbe00c6ec0cc0ada9669c72e42869804e6 SHA512 383aeebce239d3c9e75f31ce0bf0caa6eebd42b770d33453b7b004dfb9cf52aa82bf7678e98f99ddc0aaa681cf96f712e936d88ea8ab22674b7d579517705c17 WHIRLPOOL c91bb9441a5b41524654dac12293c288532011270fb58cbdc7adbbe9f5094d479ef1164f4312ad8acd52590e40baac741adfdb79865cdca02038e9f792e2add6
+DIST thunderbird-52.1.0-hsb.xpi 582241 SHA256 d32e7b469905e2831a311bf3b541330b530d57d7bc618d9e2f1e01d4fdf337e2 SHA512 a306d2ef3c481e1dc44dec5dc7c33cb82c5d678a12ed9c1297dc8d8ee7b4ab350f553645552f857570f454b87d7efde2612cb9346cfcb628487fbc002c1c7b54 WHIRLPOOL 480f4c8c727868f5aea745f118b49d6c2e8760aed675abe9b68064ef34be31bf88c8a12ea374bf5e91ea0df12d5277abd17e028c6d90d4c9afecb9133dec65b7
+DIST thunderbird-52.1.0-hu.xpi 586446 SHA256 e8264f71facb7aa89aa73ba19253d7d37b247d01bc98399c1bfcb9749b9b8e57 SHA512 eacd04be9ee244575347039fc0e366f7df15f5279495a4a485cc256b8e1340c77101c8ff611041558a3c25acdd0235a0858451af86e351f646fc0f23e36786d8 WHIRLPOOL ad9197d5d48179540ab3c4832679379c15409d1564bcb8f80fbc477b9eabfdc171debaddc3d5697da946a96b79ba08da5d2297281001c7c24293366929fe87e9
+DIST thunderbird-52.1.0-hy-AM.xpi 629879 SHA256 3fcf04ae1c549aa2408b131389bbbf7d96b3f5ae80ee51fbabcaf57f9af73581 SHA512 6f5c8f9798f069a919ad1c45ffd0d33e7392f1e899efcc8ea638c0e5dc29de324bde509fee685a865db859e2114d010bc9f481d4a7dbc8e56b936206142108e8 WHIRLPOOL 0a3693e727e1ab1bf19e6fbfc2721334c6181d281fb0a7550220374cad289f7521899f4676636245c1a7ad6d273544a3a8d980cc634a51325e3765c4d4fe42a5
+DIST thunderbird-52.1.0-id.xpi 546525 SHA256 b258b88c3618cf03258e1f2a88b58ed8a9ac8d6f510cbedc65d30fd0d1833a5f SHA512 e425cef70b6dbd649541c63b557a7b67bf9f1684a9ae6ce85a6f32befcca072f828458ac4cb3e38a497f6f4892c085738ca89f452a8436b6784010a23334ab46 WHIRLPOOL bb9169ca499c64bcf92b5ee4311e73e8c6aa7dfbf5dc872f5592a0a4fda98b3d7eb5a1882ca1726e39cde3586fbfe09ba544b2e67d3bf823fb68c5bb760deb0b
+DIST thunderbird-52.1.0-is.xpi 555712 SHA256 9a9ac947b7fa56ad90940214a383d1a2e284f1fae723683fdc03cc5cc044a7f9 SHA512 8ae48d6415cc460002083977fcdacf2f7ea74a68783f22bbf62f1c2bfd21db48037d1475adb2d2869ce3e28f12b1969e30eafe19fac5e47c05526c2d2e689b6c WHIRLPOOL baa769ad74eca2c94d538c06bcb81f405cca42b4c8ccbdf26c64db2d8e60d4846f73a8e4a0d06c49f6777dd37247212276502b6b4f8d374c5490d388d83e5e60
+DIST thunderbird-52.1.0-it.xpi 455407 SHA256 81439f2a46fc2fcbaba27a790d13371bb29944dbce536adf3a4bc88c57c58708 SHA512 b211c862d1d596db4c36c63090844a4f9968fa0e803c155c245733f3262cee87d3a22ae0d808a7705986aafd982e8a9465a4c2ba3f17acbefc4d92c5a216ece0 WHIRLPOOL 8b531d3128d3da5d17a980a03b4b4823af8e9a83761314d400c694a21e7b1026a1786ee071b083ffeee4f5cebc4aebe9dfb207091055bacbe3ff7e7bf520ed2a
+DIST thunderbird-52.1.0-ja.xpi 630052 SHA256 c614414408bd3ef96c0acae40c01cef76af07457f73ba3388f96ed646d0e93fb SHA512 8c18d4a3d01ffe49ed0557e01eb78671c4bd511a38a56d87b1481bc45049d700b1110a20dde4e092f010b2b2c967d40fcde18413a388ddefe15751e3989092cd WHIRLPOOL 5f4ec267387c2d1f31559b8d59a4ce7476b7c38d42bb283f88e119306196d78f2d681aac8d0e1aa18e8434c01a6fd198a8b40f6c1a917eed73118880d31eb827
+DIST thunderbird-52.1.0-ko.xpi 595516 SHA256 3f652698258901e7dfc05751b9c44e6c6cb303b9580b8393b85aa5ba532a5145 SHA512 25d07d0332efb2e572d24ead58b643db0c6e70e66e9a84335ec16d220f92e2dc6499f7fae3efc1fdeda18e0e48d7861da38d99bef894b49e97449df46fff7de6 WHIRLPOOL a0f9fde3f2495577313d09d941f84447566b2234663a4c92c9bbfa4ebfd26937c7e19c4e27b5215ddb0e2f5973f3833409884598c510d2f6e665098512e4bed3
+DIST thunderbird-52.1.0-lt.xpi 580598 SHA256 6800858ccd1722bb805a899af954a62cff97feb6645648ee75cfcb8948628cef SHA512 7ed6c0a7be7f2ee0f5a263701b8b137d592c04c92a00ad9fd3509000e6e42a820f5b3a3ee9d559f4efaccb79be1d5f85a396e16cdf805b68ede8119297158709 WHIRLPOOL 53227bed7a34e97885de37807ecdf030ebc672f210318d5babd375d51a43c048860079c9e1e21970ab59689149d667c06b68b15399d5c5c2469e66b2040bf8e0
+DIST thunderbird-52.1.0-nb-NO.xpi 551103 SHA256 dc7703816f06360432c9f7d69eb4db6524db38605bb43dc33fa61be0582ada08 SHA512 84347daa33229108ba73287721ff7c61725fd9f469ce8ecbb4711493c1095380002a4f39cdfad1ba696e2488fbb302eef55d0064aac99687d664c15445926f43 WHIRLPOOL 01d16015c90f21df52cd612b11ae8bbc692d95138fca5ea7d95e2fc4b2805ef848ff9707ff9b1e1fe9fdf117b0cb305665489ccaada00646110e7b66625e99a3
+DIST thunderbird-52.1.0-nl.xpi 557956 SHA256 cc1bf83672eba56775988c6671ac0101330df302ff7d3b34e3f8d84a3486ee2a SHA512 a57e9ca1dc65696883d588b744e28f9244a29e6d2bb0bb563a7a6d08e0415d2fd4e6ab1983a0d4c008f894389106c939151413a446d853e9bd8b8e099fc4c29e WHIRLPOOL 288e047f675c04532c93a59e33d635aa22613eed92e7a8c260188d97363aa1b8be3d95fca3770ac242e301e5c6e4415ba9a1ab81b69096f423455f5ad344f4a1
+DIST thunderbird-52.1.0-nn-NO.xpi 551891 SHA256 557458360291cf1b69634329b58e9f8d59f0e235ea23fe04c83692784aa05956 SHA512 f826d80adad2c5fb1ffda291111d3622fe2b21275936c97270b52b17f703c99d617184b70f734efbfb025f5385aa4eb87601c6103b833a8925a4a162f533bee5 WHIRLPOOL 2717c58a059a3be3a6dc5ffcbafea12408ce9984b80530deb8eee3f38046103aec3069acbd683e47ad3707a3a84b27d1546d22c6e70c6cf881a431b9868b4551
+DIST thunderbird-52.1.0-pa-IN.xpi 646568 SHA256 a7fbb749c6222a020cc50ddd11428c16c3fc9b1349b757426b9d2e2204e2356d SHA512 9bf90b4c193ac34dede24af6c8d5285f1b1882fb2793b8251141bb25449ce633665cef39e3046d902fee81e0e2136859d7789984a701c62706f3742578dc162e WHIRLPOOL 2d8b8658bcfcd96f7e7071c1a4a191092629b17b63b38bc950afc2f9c93f3fc7feec872f78cc3f328aff8af9bce033d6f71b7a177c11df60788986c96199ea37
+DIST thunderbird-52.1.0-pl.xpi 469901 SHA256 0ecfed322da41c4e6b21a7fab03d61a2436f0f4e0898928f19eac28b52da8a05 SHA512 133c984da409ecfcf0a4dbf426362206fdf9bed6ae994e9158dcb0adb38b46ae26c270857057354d16690932b92e9dd0f56dc7cc2f28bb43192c98a01bb2387f WHIRLPOOL 60b234c718914c4d0a27a084b18f5e42f7f1ed41039dd95eaf956ef743cf48af7543c0b21605f41becea1d3d982ff1fbec0e1eacf3a452d4d4f236c9367eeb8b
+DIST thunderbird-52.1.0-pt-BR.xpi 558223 SHA256 d5b5bec393b299367610794958ac2d7bef54ad2cc9a29ca2559c8c230bf6564b SHA512 cdedfd4afb27bab14c739a6a9906369ad8380da82a0f3a3d785b2547fdc020632005ed56628a240463612c38f7603f654f06ff4b7ee4ce2bfce6e2fd0f56a6f1 WHIRLPOOL c5b434edcfc37abba60d72e042750c2fc3c60b79828e8b29b2b14d500bb7ad4f470e9fa25faf251eaa190b3b652e939fec71afc7077609348dd0810891313fc3
+DIST thunderbird-52.1.0-pt-PT.xpi 565623 SHA256 998587a0074de0b0a26206c7de2cb83ff5bebd194e7ce184783fcc2d58eefe97 SHA512 854ae0aa33cc0c209347e34c2637b205b7d3b60b66ee41bb28d78bb84e88ca59acc5d191a2c57e866daacceb10699490b5da1e101648bca05b46992aec56940e WHIRLPOOL a823b2530a10b1682b6df5e660b86faccc94b9e3fb8cf269aa1e38f9570f92ff432db18814cc62fa7b752ef932931fe2a6ff33762ff9bad37034282f5771347b
+DIST thunderbird-52.1.0-rm.xpi 557604 SHA256 33a1c4dc8cee63c7640f7b492c171015b391f88b2629660b83845726925d1604 SHA512 a18488bb619fe62800bb34c229d3aea2d67b1366e1c511bb0c58fbcd36a2afaf7fdb4bc1a9549286f51b3b8b593c0d1f54ab4cdc9274022e5b79b0e28684f449 WHIRLPOOL d6c159622b1160b8b6172567f2cb332c3a05d8b8ac49a43c2bc4de7a794af1f54f524dcf80d711c201096e6b1ab4d06534e6b7fd3ad27553171ccdfc3ebd7ad9
+DIST thunderbird-52.1.0-ro.xpi 570529 SHA256 f59e4ac38e6f60808bc7552da66a74a9b059f3e6fd8d1aef2999cac3b157de5a SHA512 c7fd181488ef4c70615336ef65dafcdd7c64ea06bfd306537f9b57782fa4991e767972d89ac371b8b5d8e75e484c8b5993a50440152621ed23a3a3569fcf1e63 WHIRLPOOL 8b00d253456ea88744ca8decd05547e3eaf1dcf5d95bdeb97f85e3a048cbc26190245104fd811ca3ed0d5c91f3431f0529c1a2fe5ae053ace5d90f8ffa2a9866
+DIST thunderbird-52.1.0-ru.xpi 530669 SHA256 d152fa89d2e6769b00ef8a7c04debc6da8e8a7013a5faf92038651a99172bec9 SHA512 35d3970ff9f11edd373b923eba743e4ed37e81222e1f423de7143e9c304547dd53bd20e321af1da39fb9754b89e44c1352c28e87ab168795e8d62de94df97159 WHIRLPOOL 52e8ec3ddacf7069b76029f38aa65eadc66591b717e79581c9d4b9ae7f1804f49cd56cebb239b63e66506ce1fbd21ef50c994cc5fd90ef088923299ae76ae967
+DIST thunderbird-52.1.0-si.xpi 649009 SHA256 f4d0a47bef66689b53506078e961547c0100e7104a5960c9eec2341facad27d5 SHA512 b1d0d2f0ae18b0d12e99f9eafbba160ac71d4d4569d94281a9f1eb0cafaf33e7031647a9f0d583c10d048311828ce797a043075e131f3da79c614a37a2d40974 WHIRLPOOL 65dd414d8bea14c5c8c7ac723fea2c9dff1a4ea3bd5aeb395eb29183ebf4830cfd691fccedc433fa90cb49dfebf86e2822ae84d909abca84befa8da83e66e646
+DIST thunderbird-52.1.0-sk.xpi 583881 SHA256 5d57f3e86f4e19daf5fa0fc5cb63aaff646d4cbd47a742c04ba77259c25dffb7 SHA512 882c2f2e2a2f7b14c5557288461d1be96c36328f7f6fd2a1dfcce9ecb65cb9e8665b6547f1eedcc7867df1e6512f34c97f44c9fbb6f517e477bde7752a997420 WHIRLPOOL 987dacbc1e7aec4be7df1019e84045c727f6f107bb6fc3a72f73029679611849c6db3b651311b53523867aa0234a6ba4a07330131dbe5f59007e21f7e59195df
+DIST thunderbird-52.1.0-sl.xpi 562830 SHA256 56dda066bd8e6367351d0790a2765a05813bf19b65aeab27cbdc133609a30b2c SHA512 6a19f9f9f12904f012de0467fde97b9a38e5cdf58156fa38836887533dd0810fbfc44c1899139945ffea7fc9484b1fb30b57730a9a659345473748b022aa315b WHIRLPOOL 4416dd56228bc91cdfcdd3e2f4fb7c0771330d2a7592f0b41bf74e916d81f918fb0bdc26a78f1279756dec413ae3ce6684b50fda72e9d4a4528d05683711ee2d
+DIST thunderbird-52.1.0-sq.xpi 570615 SHA256 8a2773b55f020278f658b7254dcedf0d17154b6f5d63400943cd15bf902c9019 SHA512 444e1994322ac301408b0a00ac024870936c40320bbd9c9c81ad004e7f63180467493f261f7324fc8e0e21daebf4667cd136de47b77f9f92bf71478b03aa26c4 WHIRLPOOL 6e5770d916e8ed70b81edd4ba638c3115be8ff36ac0a12ced4af70ca99f6badeb4a5bae31ca7e44502544af49760c29a066817c8378074b0f2f8305e48ce739e
+DIST thunderbird-52.1.0-sr.xpi 609019 SHA256 09f3de38925c36734471ec2694094211236d1edae433280e7547ec57c8040826 SHA512 6a10a0de9a5dd758561d926a171718e973798331a26928edaa9ca02eeb3117edd473ae75c58fb6d1f7e833897ef0f5c6d62812eff29b44bafd7cef38dbbf654e WHIRLPOOL 69534111fb40485d90aeff89a6261b00a437f4908271cbc6173c27f2d4684eaadad870fdf6de459fd4430331c2233cf3b71c56a100da3ed163f2348aa0f4dfbc
+DIST thunderbird-52.1.0-sv-SE.xpi 565777 SHA256 5f3705d4270357b3e57fd26131155516fc51a47886a20ef143905e15334dd86a SHA512 e34c4ca1dbc47577500118b2cc08ba069cf85adfd456c56799682e79e0b95890f5f95a086ec79fa8bafe8d3256bbf14716797b241afc6f105a76e8f251724c1e WHIRLPOOL 1be831f7b5822c0bc8e9d3fb65b58304173dda353911e19c01ee698513d2a679744bb86237e997b50aa5eb6de66fc864d5319b6ec82e5e5f4473f30d6dbce92a
+DIST thunderbird-52.1.0-ta-LK.xpi 675038 SHA256 bb585f6cc8166e5445e84220cd432a99489ea898e58edcd7a0b0f2134ba73acd SHA512 5f016a5bd47dc6580bca46c39bf02f679ea703cbba6153efae47c530241dae38375427030bd89e326f6023cf225876d1b1233da9357fae35f47516a5b319f47d WHIRLPOOL 8c758ad35c8549ad29cfd447cabde7e36799786317bf7d97e2a182d985722c89c169c58149bade6528833658691bc781b9977a96f8ed9ca443d3fa7fe8cab250
+DIST thunderbird-52.1.0-tr.xpi 569926 SHA256 d95eeadbf12ae6e554a7f9a1453befc6dc3530b3e441491db4ed96aa7c355463 SHA512 ee98dcf1795e59e691d94253caff84983ac7d7122444f6e45f25f39a4c78f4b0f8dcaa798f3fc67d5af2d6faf37b0aeea6f596b5a035bde09255ab94d9f05369 WHIRLPOOL efbb32761dbb14b0a9a458017140a019ca87f8497cd7587be9d538a9404924393076e2e4abdf5e7c6b0b3c423b78609f713aeb4f07f91077cdfd2652052b5d31
+DIST thunderbird-52.1.0-uk.xpi 652854 SHA256 124146d36b56811e02c1f6a849611e4977a2189fd95b793b71347532caf76070 SHA512 f0c240927c0801feaf6477bf93347fd5306cd98f932d4590b0fa39003a7c46420c8b2ada1917e379ab84548f6bee3dc01f29ee18f3fe68fce173297151b5533c WHIRLPOOL 706874ab353e544204ee8e53e335c99d2ee646137b77cc1cab3ec188b5f28e514d90b6608d20844359c666d73eeb4e11f46526a5b74bfd7ea591dd1f9caa3d4b
+DIST thunderbird-52.1.0-vi.xpi 637163 SHA256 8e3c84b436a9d0465507bdf42dd42c9b26d23987fd7f7a46cad8dd9f6ad0afcc SHA512 8637fdeb3ae22a4eebd746a2ab0c8d65723ff13f81769025e20f31f8b143d6933278c01dd28992ce72c48cf597e6ef69ceb43cd4066b9dfe86453ff40e82bc5c WHIRLPOOL 18e4ee4fe13c4984ff9c6d91ad1709ca956f6a63610614ec781158f6f559ca75e43661d6fb4dedb60af779883b5d429b401e6f093b2f2e4596b9a4aa1217a257
+DIST thunderbird-52.1.0-zh-CN.xpi 593611 SHA256 e372440fcafc54328c5df328fc22642924eec67fd05e33f8ad5a15cfdbef878b SHA512 ffa94231b1ed5e9b978369cc683080336d89f18322b1d7ecb9787450615de13ef1d9fd33a3fb95cc14a03d2ae8f693c2f770aa8f5dacb059150648bd243f8243 WHIRLPOOL d7bac965d6d5119751ce59fccb18a39fff76435a09bff67d9d2d61d59e8530c2d6b70a48efebd4cd2296bff0d03daf90e97f2c2f284746569722693e60ee7cac
+DIST thunderbird-52.1.0-zh-TW.xpi 595728 SHA256 2ba552e364815ddebef45de1e7442add05bd81d34516a512b4f6f59b9c3cfdfa SHA512 526dce3da955c63f2e2f0f70d916433e95977f08792e24931dcf1b28bfb0480d9784959fae25162fae38faf4c75c96913b392a907f0f07181cd80222e7a263c1 WHIRLPOOL f3b3faa13dc6b8e4131f34453c68cc27bfaf24145349edc73a4670dbcfec8095eaf69b3de9e8a7a68bd5c49ddb14d47228febf28495467887eb5b0e49004b2b4
+DIST thunderbird-52.1.0.source.tar.xz 228493044 SHA256 c33ca35b6acd1a0dc0d0f4b1df16745a33144c5d3d3715fe05454a5e9eefd48b SHA512 08016334a0cc8af96d5c5b9aad0b8bf1ca3c105ff4a412abbeaeefefda1301cb149eafb4e78314f710567b952267d1d3c999dc8e5534a4a8d06abdcb11ee98c8 WHIRLPOOL 78b88dd94607923b80f18c306b9376887489efedcb598b38cbdd506b05a4371a514d22e6a0b992bc0c3d5cd6a4d63cdfb824d4cfd1233cb075e1cf30f01b8fb6
diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
new file mode 100644
index 000000000000..01542105e64d
--- /dev/null
+++ b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
@@ -0,0 +1,25 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Add the gentoo preferences for the omni.jar creation
+
+diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
+--- a/mail/installer/package-manifest.in
++++ b/mail/installer/package-manifest.in
+@@ -313,16 +313,17 @@
+ @RESPATH@/components/devtools-startup.manifest
+ @RESPATH@/components/devtools-startup.js
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ; Default Profile Settings
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; default pref files
++@RESPATH@/defaults/pref/all-gentoo.js
+ @RESPATH@/defaults/pref/all-thunderbird.js
+ @RESPATH@/defaults/pref/channel-prefs.js
+ @RESPATH@/defaults/pref/composer.js
+ @RESPATH@/defaults/pref/mailnews.js
+ @RESPATH@/defaults/pref/mdn.js
+ @RESPATH@/defaults/pref/smime.js
+ @RESPATH@/defaults/pref/thunderbird-branding.js
+ @RESPATH@/greprefs.js
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 721f723be5d4..9b3685ecc048 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -14,7 +14,10 @@
 		(note 38.0 and above bundles calendar support when this flag is off)</flag>
 	<flag name="custom-optimization">Build with user-specified compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
+	<flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag>
+	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
+	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
diff --git a/mail-client/thunderbird/thunderbird-45.8.0.ebuild b/mail-client/thunderbird/thunderbird-45.8.0.ebuild
index 5167a2f132ca..d64998c5946f 100644
--- a/mail-client/thunderbird/thunderbird-45.8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.8.0.ebuild
@@ -34,7 +34,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-util
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/mail-client/thunderbird/thunderbird-45.7.0.ebuild b/mail-client/thunderbird/thunderbird-52.1.0.ebuild
similarity index 74%
rename from mail-client/thunderbird/thunderbird-45.7.0.ebuild
rename to mail-client/thunderbird/thunderbird-52.1.0.ebuild
index 23567d2704e2..dd614cc9a500 100644
--- a/mail-client/thunderbird/thunderbird-45.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.1.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.7.7"
-MOZ_LIGHTNING_GDATA_VER="2.6"
+MOZ_LIGHTNING_VER="5.4.1"
+MOZ_LIGHTNING_GDATA_VER="3.3"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
@@ -16,12 +16,8 @@ uk vi zh-CN zh-TW )
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}"
 
-# Enigmail version
-EMVER="1.9.1"
-
 # Patches
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-11"
+PATCHFF="firefox-52.0-patches-08"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
@@ -31,44 +27,36 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 MOZ_P="${PN}-${MOZ_PV}"
 
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 fdo-mime gnome2-utils
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit flag-o-matic toolchain-funcs mozconfig-v6.52 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 fdo-mime gnome2-utils
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
 RESTRICT="!bindist? ( bindist )"
 
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
 SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
 	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}-r1.tar.xz )
-	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
 	${PATCH_URIS[@]}"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 CDEPEND="
-	>=dev-libs/nss-3.21.1
-	>=dev-libs/nspr-4.12
-	!x11-plugins/enigmail
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${CDEPEND}
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	crypt? ( x11-plugins/enigmail[-thunderbird(-)] )
+	"
+
+DEPEND="rust? ( dev-lang/rust )
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
 	x86? ( ${ASM_DEPEND}
@@ -100,13 +88,6 @@ pkg_pretend() {
 	# Ensure we have enough disk space to compile
 	CHECKREQS_DISK_BUILD="4G"
 	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
 }
 
 src_unpack() {
@@ -124,8 +105,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our Thunderbird patchset
-	rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
-	eapply "${WORKDIR}/thunderbird"
+	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
@@ -193,13 +173,13 @@ src_configure() {
 	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
 	mozconfig_annotate '' --enable-calendar
 
 	# Other tb-specific settings
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
 
 	mozconfig_use_enable ldap
+	mozconfig_use_enable rust
 
 	mozlinguas_mozconfig
 
@@ -210,6 +190,7 @@ src_configure() {
 
 	# Use an objdir to keep things organized.
 	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
 
 	# Finalize and report settings
 	mozconfig_final
@@ -227,34 +208,23 @@ src_configure() {
 		append-cxxflags -fno-stack-protector
 	fi
 
-	if use crypt; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
-		econf
-		popd &>/dev/null ||die
-	fi
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
 }
 
 src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake -j1 xpi
-		popd &>/dev/null || die
-	fi
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
 }
 
 src_install() {
 	declare emid
 	cd "${BUILD_OBJ_DIR}" || die
 
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
 	# Copy our preference before omnijar is created.
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
 		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
@@ -266,13 +236,10 @@ src_install() {
 	# dev-db/sqlite does not have FTS3_TOKENIZER support.
 	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
 	if in_iuse system-sqlite && use system-sqlite ; then
-		echo "lockPref(\"mailnews.database.global.indexer.enabled\", false);" \
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
 			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
 	fi
 
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install
 
@@ -329,23 +296,13 @@ src_install() {
 		doins -r "${T}/${emid}"
 	fi
 
-	if use crypt ; then
-		local enigmail_xpipath="${WORKDIR}/enigmail/build"
-		cd "${T}" || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	if use crypt; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' /usr/share/enigmail/install.rdf)
+		dosym /usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
 	fi
 
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
 
 	if use minimal; then
 		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
@@ -361,20 +318,11 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 
-	if use crypt; then
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gtk*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-			ewarn "You may be prompted for your password in an inaccessible shell!!"
-			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-			;;
-		esac
-	fi
 	elog
 	elog "If you experience problems with plugins please issue the"
 	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
 	elog "then restart thunderbird"
+
 	if ! use lightning; then
 		elog
 		elog "If calendar fails to show up in extensions please open config editor"
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 075cf71756fc..653612c97824 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,5 +7,5 @@ DIST postfix-3.1.2.tar.gz 4337569 SHA256 1ab9b4ee6bf9eb37d2467a63244132aab22ac23
 DIST postfix-3.1.3.tar.gz 4338730 SHA256 52f8127e6797e2617a36d0afb9473c55e95c3a777b6280df3f106168fd814979 SHA512 00e2b0974e59420cabfddc92597a99b42c8a8c9cd9a0c279c63ba6be9f40b15400f37dc16d0b1312130e72b5ba82b56fc7d579ee9ef975a957c0931b0401213c WHIRLPOOL 7274501921349e1f99344adb500638e91b92f3a3a87ec2171add18d58b926478459d4540a15f421c52175efb61d220c98438a9727adf5473d609d1b94480b663
 DIST postfix-3.1.4.tar.gz 4340102 SHA256 f33b470c47ae8b4ff199ab55dc42e86031ff0c535ccbc83069c8cff69b5bd027 SHA512 4cf8aa8d0cf6d99defa32c2907705370d6f8d047d7e938c84a20a62c68ae07a2bec304f28c178d1072b9610f2969420f83fe2066821ad34c0f95e62bbb5b8c05 WHIRLPOOL 72c881a390e96dcc3645b98383e4dcc774ac61144b086800d72e0f6e4d8fe3adccb246df728cc253851db16804e9c97c79e9966f88f02deda696117cd20551f7
 DIST postfix-3.2.0.tar.gz 4389547 SHA256 420726e79622620394fd17799e49268dada7041ea067ca3aa1c8bf155b9aa487 SHA512 bfaa4b2125758833997b399bb2f095475924c1e51fba752e631ad73494d8764458548541d175ef8a1ed6566e9dac569f963e0651e1500aa19595f9062b8e86ce WHIRLPOOL e4a37cb3bd3faec5a3fd24bc03631af51be90369e1299fd9f2d46f5194ba4d011affdf04e1566ca14fed20e3e31d60b1011ced2f21ae4f0744db08828cf0f20d
-DIST postfix-3.3-20170218.tar.gz 4396987 SHA256 eba6a0f8c8100e00a872c35f2336a602d8c0753f74b36f055ffab1eaf0da847f SHA512 3a939f913cbde86c8ab4c33f31f0fd32130e5f4191a08e8975dc25acb4ba166cf88ddea06a8b8c05734919369828a6b9a1f545a7f753b1495dc493b683784a29 WHIRLPOOL 7191909abd764a6e499146b8628ccac3f2c555fdf708149ff866a0b2370e1066a33a5ea5af948fe91eb9e056f6475a15dcddf7b59ee13acedc252835394182ba
+DIST postfix-3.3-20170502.tar.gz 4396873 SHA256 bf78fe59b9849ccff71d02063469d4e9781fe39bea4ab7f3dda72e6c2931e1a6 SHA512 61c241c198cf95918f8e1af6b323a19bafcfea26a725cf167d08520694dc6c85614a0bc1af1eab00fdf7323d1e1ada8ced557528a4396965a71a228806aa5e44 WHIRLPOOL bc2c5489886b7a0fedfd1bd8ce945cc96db42f01ac90513ea7981468d8185d378bb4245a51bd15b2c7df11f8015fed2ab95eae90e6237f898d6915f9b359e3c2
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.3_pre20170218.ebuild b/mail-mta/postfix/postfix-3.3_pre20170502.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.3_pre20170218.ebuild
rename to mail-mta/postfix/postfix-3.3_pre20170502.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..2df1f9d8211a
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DNDEBUG
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 6227e71e7bdb..260fc8ecd14c 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils libtool multilib-minimal python-any-r1 xdg-utils
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -19,7 +19,7 @@ SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
-IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DNDEBUG
+		append-cppflags -DHB_NDEBUG
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
index e1e4c10d0b7b..0adaa5c71dd3 100644
--- a/media-libs/virglrenderer/Manifest
+++ b/media-libs/virglrenderer/Manifest
@@ -1,2 +1,2 @@
 DIST virglrenderer-0.2.0.tar.xz 198544 SHA256 eab6d5bd99a6fab8930d5b5d4fa304d43b6e57d807a0354d982b49ccb53453c3 SHA512 c10db5693d86acc5f14ef6bcfda5187ffc23c779c4cf95f12539dd658ed876bf7924358573de3598a084753281ade25ace23f016d1d1defe7ce399e9e7ac81cb WHIRLPOOL 4b38b5bcb222112e21656f215e4aeba57d2a65a72b2a446262fbe998a83ac1ec8ae0a29ac3b50709586cae66f95bcfda4227270ff164f1a5152dfba79a2091dd
-DIST virglrenderer-0.5.0.tar.xz 221516 SHA256 82f1e06e5e3be1ac1bdeeb661cba35e56e30d24c558ad8660cca17a792886bcb SHA512 2e1f9b36de7e23879fd9a0e17f68d96bfaf57ded4c4bdfb7c5db2c81c7567ddd8c15fa95ebd09673c008951a40fa36c543091ae978f989763ac2a7174419e98d WHIRLPOOL fc0b1de43aebebf56ecc50efd5c8cddd578bfbd575ffc1db2ea922998fbe50269477f9baef9ac8a0f5e193c542a14729204c08c8c814546a975bf507ed8ef624
+DIST virglrenderer-0.6.0.tar.xz 222536 SHA256 2900b106dcf831b2e6eb28db934740bb183a4cee01bab8ed07deed5e82d99cc4 SHA512 23d5f8c582f02303e3b4b59a6ca66e7859367a0bb931b884521f615bf9e25290f1ad2a32a92c127df1ec0f48503e20f557f6e910973ca2c7620b75801d5f3401 WHIRLPOOL f281fc6c9a9f83d9a4cb17b0da25a71d5cfb2634396ab0b4f4e86ab9e72b8af76d061f4553ee58a4734767944ebd4d7a45741c7e3e738ef0091513a47ed9dbd0
diff --git a/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch b/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
new file mode 100644
index 000000000000..17bc3bce0a8d
--- /dev/null
+++ b/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
@@ -0,0 +1,10 @@
+diff -Naur virglrenderer-0.5.0.orig/src/Makefile.am virglrenderer-0.5.0/src/Makefile.am
+--- virglrenderer-0.5.0.orig/src/Makefile.am	2016-04-11 11:23:51.000000000 +0600
++++ virglrenderer-0.5.0/src/Makefile.am	2016-11-18 04:44:32.278594781 +0600
+@@ -1,5 +1,6 @@
+ SUBDIRS := gallium/auxiliary
+ AM_LDFLAGS = -lm \
++	$(LIBDRM_LIBS) \
+ 	$(GBM_LIBS) \
+ 	$(EPOXY_LIBS) \
+ 	$(CODE_COVERAGE_LDFLAGS)
diff --git a/media-libs/virglrenderer/virglrenderer-0.5.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
similarity index 85%
rename from media-libs/virglrenderer/virglrenderer-0.5.0.ebuild
rename to media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
index d9b1ceb5ea47..8dfce45e0bd3 100644
--- a/media-libs/virglrenderer/virglrenderer-0.5.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit autotools eutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/virglrenderer"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
@@ -28,7 +28,12 @@ DEPEND="${RDEPEND}
 	>=x11-misc/util-macros-1.8
 	test? ( >=dev-libs/check-0.9.4 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-libdrm.patch
+)
+
 src_prepare() {
+	default
 	[[ -e configure ]] || eautoreconf
 }
 
diff --git a/media-libs/virglrenderer/virglrenderer-9999.ebuild b/media-libs/virglrenderer/virglrenderer-9999.ebuild
index e66af32a53a9..bbd6c4c2fabc 100644
--- a/media-libs/virglrenderer/virglrenderer-9999.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit autotools
+inherit autotools eutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/virglrenderer"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-libs/check-0.9.4 )"
 
 src_prepare() {
+	default
 	[[ -e configure ]] || eautoreconf
 }
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9e5e19c221e9..6fc720a2fac7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 03 May 2017 04:39:39 +0000
+Thu, 04 May 2017 08:08:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9e5e19c221e9..6fc720a2fac7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 03 May 2017 04:39:39 +0000
+Thu, 04 May 2017 08:08:49 +0000
diff --git a/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r4 b/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r4
deleted file mode 100644
index eae7aa7084f6..000000000000
--- a/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r4
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Ebuild for setting up a Gentoo rsync mirror
-EAPI=0
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-_md5_=e29fb12649aa96e318c76a442432ad04
diff --git a/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r5 b/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r5
index d1cb7855c1d9..50ddd1303e82 100644
--- a/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r5
+++ b/metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r5
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Ebuild for setting up a Gentoo rsync mirror
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync
-KEYWORDS=alpha amd64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
-_md5_=e04653a64900eba725b878dc6d345b59
+_md5_=d04a092f456dae27a6b2c43936b9a59b
diff --git a/metadata/md5-cache/app-admin/petrovich-1.0.0-r1 b/metadata/md5-cache/app-admin/petrovich-1.0.0-r1
index 270d71833f14..366ac6e5e3ef 100644
--- a/metadata/md5-cache/app-admin/petrovich-1.0.0-r1
+++ b/metadata/md5-cache/app-admin/petrovich-1.0.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
-DEPEND=virtual/perl-Digest-MD5
 DESCRIPTION=Filesystem Integrity Checker
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/petrovich
 KEYWORDS=~amd64 ~x86 ~ppc ~sparc
 LICENSE=GPL-2
+RDEPEND=virtual/perl-Digest-MD5
 SLOT=0
 SRC_URI=mirror://sourceforge/petrovich/petrovich-1.0.0.tar.gz
-_md5_=afd919da3f688a28c5305ecb691ad9a3
+_md5_=1a3efda5e1272eaddaf71201a8e7cab4
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.20_rc1 b/metadata/md5-cache/app-admin/sudo-1.8.20_rc2
similarity index 91%
rename from metadata/md5-cache/app-admin/sudo-1.8.20_rc1
rename to metadata/md5-cache/app-admin/sudo-1.8.20_rc2
index 435587056fbe..70bcb4774358 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.20_rc1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.20_rc2
@@ -8,6 +8,6 @@ LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/beta/sudo-1.8.20rc1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.20rc1.tar.gz
+SRC_URI=http://www.sudo.ws/sudo/dist/beta/sudo-1.8.20rc2.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.20rc2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=db9f97ff8299acf6ed40835ed26ea35f
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.3.0 b/metadata/md5-cache/app-crypt/heimdal-7.3.0
new file mode 100644
index 000000000000..1d3c47febd8b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/heimdal-7.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Kerberos 5 implementation from KTH
+EAPI=6
+HOMEPAGE=http://www.h5l.org/
+IUSE=afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=BSD
+RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+SLOT=0
+SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.3.0/heimdal-7.3.0.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=5a70b3638286f6e729cef4821b5beaad
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
new file mode 100644
index 000000000000..8f47ac6df916
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=A major mode for GNU Emacs for editing YAML files
+EAPI=6
+HOMEPAGE=https://github.com/yoshiki/yaml-mode
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	19ff54b35acd0bf2a14831a308a57753
+_md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.8 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.8
deleted file mode 100644
index ee7bc8c5c553..000000000000
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing YAML files
-EAPI=4
-HOMEPAGE=https://github.com/yoshiki/yaml-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://github/yoshiki/yaml-mode/yaml-mode-0.0.8.tar.gz
-_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=dd4f94c157620cd998cabb3790436392
diff --git a/metadata/md5-cache/app-emulation/docker-17.05.0_rc2 b/metadata/md5-cache/app-emulation/docker-17.05.0_rc2
deleted file mode 100644
index f05f7992b6a9..000000000000
--- a/metadata/md5-cache/app-emulation/docker-17.05.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.7:= virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The core functions you need to create Docker images and run Docker containers
-EAPI=6
-HOMEPAGE=https://dockerproject.org
-IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-0.2.5_p20170329 ~app-emulation/docker-runc-1.0.0_rc2_p20170310[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.1[static] )
-RESTRICT=installsources strip
-SLOT=0
-SRC_URI=https://github.com/docker/docker/archive/v17.05.0-ce-rc2.tar.gz -> docker-17.05.0_rc2.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	golang-base	2983c8674b8e3b3a99ec61986356c76a	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=08e0a9e6c93d4b4ec12adb6ad0a9a147
diff --git a/metadata/md5-cache/app-emulation/docker-17.05.0_rc1 b/metadata/md5-cache/app-emulation/docker-17.05.0_rc3
similarity index 92%
rename from metadata/md5-cache/app-emulation/docker-17.05.0_rc1
rename to metadata/md5-cache/app-emulation/docker-17.05.0_rc3
index be2a39ea3b53..ebbb629fe542 100644
--- a/metadata/md5-cache/app-emulation/docker-17.05.0_rc1
+++ b/metadata/md5-cache/app-emulation/docker-17.05.0_rc3
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-0.2.5_p20170329 ~app-emulation/docker-runc-1.0.0_rc2_p20170310[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.1[static] )
 RESTRICT=installsources strip
 SLOT=0
-SRC_URI=https://github.com/docker/docker/archive/v17.05.0-ce-rc1.tar.gz -> docker-17.05.0_rc1.tar.gz
+SRC_URI=https://github.com/docker/docker/archive/v17.05.0-ce-rc3.tar.gz -> docker-17.05.0_rc3.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	golang-base	2983c8674b8e3b3a99ec61986356c76a	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=edcb40e8f1922b3485f37fac039a3db6
+_md5_=40be38f6892887a084444f5306d38f46
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.10.0 b/metadata/md5-cache/app-emulation/docker-compose-1.10.0
deleted file mode 100644
index 337450ced800..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=5
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.10.0.tar.gz -> docker-compose-1.10.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d412314ad7c08e5d2228d86920eb2490
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.10.1 b/metadata/md5-cache/app-emulation/docker-compose-1.10.1
deleted file mode 100644
index 9b21fd4b324a..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.10.1.tar.gz -> docker-compose-1.10.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0e2edf6794ab6e2f2c5e44390dc9399f
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.11.1 b/metadata/md5-cache/app-emulation/docker-compose-1.11.1
deleted file mode 100644
index 4377f18333f5..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.11.1.tar.gz -> docker-compose-1.11.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0e2edf6794ab6e2f2c5e44390dc9399f
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.13.0 b/metadata/md5-cache/app-emulation/docker-compose-1.13.0
new file mode 100644
index 000000000000..99d51b596399
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-2.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=6
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-2.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.13.0.tar.gz -> docker-compose-1.13.0.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=0fb76879ec276f9c2d4b42758c17a623
diff --git a/metadata/md5-cache/app-emulation/qemu-2.9.0-r1 b/metadata/md5-cache/app-emulation/qemu-2.9.0-r1
index 823b40d0a791..6b8ca0d1d5f6 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.9.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-2.9.0-r1
@@ -7,8 +7,8 @@ IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gn
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.9.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	l10n	8f52d9ce1814aca2ed1a46920084ea66	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0c146845701868504e524e1a93905464
+_md5_=c9dae5559d420f8cfd6b89239121ba93
diff --git a/metadata/md5-cache/app-emulation/qemu-2.9.0-r51 b/metadata/md5-cache/app-emulation/qemu-2.9.0-r52
similarity index 63%
rename from metadata/md5-cache/app-emulation/qemu-2.9.0-r51
rename to metadata/md5-cache/app-emulation/qemu-2.9.0-r52
index 112ee60d37e8..bbefd0466b52 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.9.0-r51
+++ b/metadata/md5-cache/app-emulation/qemu-2.9.0-r52
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=6
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.9.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	l10n	8f52d9ce1814aca2ed1a46920084ea66	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=20fae0b50b7620a29d8e1b1040bab7f1
+_md5_=edb7d4ebc9671b700f15bf1891e0bc2b
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index be51b580e982..d7d19ea1c14f 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -6,7 +6,7 @@ HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.1[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/ipxe sys-firmware/seabios[seavgabios] sys-firmware/sgabios ) ) selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	l10n	8f52d9ce1814aca2ed1a46920084ea66	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5cd133fa9e2f971b88d4e42585eff658
+_md5_=f6b2be6c702dfb66830533d64aeb6397
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1
new file mode 100644
index 000000000000..dc7db8218d65
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
+EAPI=6
+HOMEPAGE=http://wiki.qemu.org/Features/QAPI/GuestAgent
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
+SLOT=0
+SRC_URI=http://wiki.qemu.org/download/qemu-2.8.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=353649f9dbbb969358fbef78e116f632
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0
new file mode 100644
index 000000000000..92cae7ba7106
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
+EAPI=6
+HOMEPAGE=http://wiki.qemu.org/Features/QAPI/GuestAgent
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
+SLOT=0
+SRC_URI=http://wiki.qemu.org/download/qemu-2.9.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=353649f9dbbb969358fbef78e116f632
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.7 b/metadata/md5-cache/app-emulation/wine-any-2.7
new file mode 100644
index 000000000000..573e378db72e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-any-2.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix
+EAPI=6
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
+RESTRICT=test
+SLOT=2.7
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.tar.gz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.7.tar.gz -> wine-staging-2.7.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.7.tar.gz )
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	l10n	8f52d9ce1814aca2ed1a46920084ea66	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=55e46c6f32254cdd476db3464323ca9a
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.7 b/metadata/md5-cache/app-emulation/wine-d3d9-2.7
new file mode 100644
index 000000000000..707833337ba5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix
+EAPI=6
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
+RESTRICT=test
+SLOT=2.7
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.tar.gz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.7.tar.gz )
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	l10n	8f52d9ce1814aca2ed1a46920084ea66	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=f515f59e87672d6f868c79f7b61ff0c9
diff --git a/metadata/md5-cache/app-misc/rlwrap-0.42-r1 b/metadata/md5-cache/app-misc/rlwrap-0.42-r1
index a09f877d5bb9..f3a90aa82b1e 100644
--- a/metadata/md5-cache/app-misc/rlwrap-0.42-r1
+++ b/metadata/md5-cache/app-misc/rlwrap-0.42-r1
@@ -1,4 +1,5 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure
+DEPEND=sys-libs/readline:0=
 DESCRIPTION=GNU readline wrapper
 EAPI=6
 HOMEPAGE=http://utopia.knoware.nl/~hlub/uck/rlwrap/
@@ -8,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap-0.42.tar.gz
-_md5_=ec822cf8a89930053d54d7b208aa9390
+_md5_=08f82d8ea93ed4e8fd6223a2be68f159
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
new file mode 100644
index 000000000000..4c47c19607da
--- /dev/null
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/fetchcommandwrapper
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/fetchcommandwrapper/archive/0.7.3.tar.gz -> fetchcommandwrapper-0.7.3.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=bbf60311affb73a491309456f568c4c2
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.23 b/metadata/md5-cache/dev-db/mariadb-10.1.23
new file mode 100644
index 000000000000..eea4a9d5f0ac
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.23
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.23/source/mariadb-10.1.23.tar.gz mirror://gentoo/mysql-extras-20170316-1355Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170316-1355Z.tar.bz2
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	mysql-multilib-r1	90767a595f91040176b9a1ed74bdbf47	prefix	df8265631f8bf5f5df387e9b987121f9	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=19f55248489d5463b788b6a5752a9744
diff --git a/metadata/md5-cache/dev-java/gradle-bin-3.4.1 b/metadata/md5-cache/dev-java/gradle-bin-3.4.1
new file mode 100644
index 000000000000..b3ab69d342d7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-3.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=6
+HOMEPAGE=http://www.gradle.org/
+IUSE=source doc examples elibc_FreeBSD
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
+SLOT=3.4.1
+SRC_URI=http://services.gradle.org/distributions/gradle-3.4.1-all.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=930ef5ac3c1f13a3b806dcb46b50b2b1
diff --git a/metadata/md5-cache/dev-lang/go-1.8.1 b/metadata/md5-cache/dev-lang/go-1.8.1
index f86e1a5d20cc..78d1d409c261 100644
--- a/metadata/md5-cache/dev-lang/go-1.8.1
+++ b/metadata/md5-cache/dev-lang/go-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=http://www.golang.org
 IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.8.1
 SRC_URI=https://storage.googleapis.com/golang/go1.8.1.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=7f680c7c1a5386041cbcae827875e5fd
+_md5_=19c1b405cc0c433793fb983589b21047
diff --git a/metadata/md5-cache/dev-libs/leatherman-0.12.0 b/metadata/md5-cache/dev-libs/leatherman-0.12.1
similarity index 89%
rename from metadata/md5-cache/dev-libs/leatherman-0.12.0
rename to metadata/md5-cache/dev-libs/leatherman-0.12.1
index b095ad309798..1b9404650930 100644
--- a/metadata/md5-cache/dev-libs/leatherman-0.12.0
+++ b/metadata/md5-cache/dev-libs/leatherman-0.12.1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 SLOT=0
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.12.0.tar.gz -> leatherman-0.12.0.tar.gz
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.12.1.tar.gz -> leatherman-0.12.1.tar.gz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d9c29672c49c6b4181f4a4db783f2b22
diff --git a/metadata/md5-cache/dev-libs/libnl-3.3.0_rc1 b/metadata/md5-cache/dev-libs/libnl-3.3.0
similarity index 98%
rename from metadata/md5-cache/dev-libs/libnl-3.3.0_rc1
rename to metadata/md5-cache/dev-libs/libnl-3.3.0
index ccb49d3fb009..ee4a4878fa97 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.3.0_rc1
+++ b/metadata/md5-cache/dev-libs/libnl-3.3.0
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=3
-SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_3_0rc1/libnl-3.3.0-rc1.tar.gz
+SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_3_0/libnl-3.3.0.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b54088b4fb63fd320ea92eee21373afe
diff --git a/metadata/md5-cache/dev-libs/libressl-2.3.9 b/metadata/md5-cache/dev-libs/libressl-2.3.9
deleted file mode 100644
index d78fbe3aa285..000000000000
--- a/metadata/md5-cache/dev-libs/libressl-2.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/openssl:0
-DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
-EAPI=5
-HOMEPAGE=http://www.libressl.org/
-IUSE=+asm static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=ISC openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!dev-libs/openssl:0
-SLOT=0/38
-SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=85fde90be16f09560521522916259895
diff --git a/metadata/md5-cache/dev-libs/libressl-2.4.4 b/metadata/md5-cache/dev-libs/libressl-2.4.4
deleted file mode 100644
index b0fa3b70abaf..000000000000
--- a/metadata/md5-cache/dev-libs/libressl-2.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/openssl:0
-DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
-EAPI=5
-HOMEPAGE=http://www.libressl.org/
-IUSE=+asm static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=ISC openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!dev-libs/openssl:0
-SLOT=0/39
-SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.4.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d9446a5be1d85dae47decb507cbfdb79
diff --git a/metadata/md5-cache/dev-libs/libressl-2.5.1 b/metadata/md5-cache/dev-libs/libressl-2.5.1
deleted file mode 100644
index c520b0db6d9d..000000000000
--- a/metadata/md5-cache/dev-libs/libressl-2.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/openssl:0
-DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
-EAPI=6
-HOMEPAGE=http://www.libressl.org/
-IUSE=+asm static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=ISC openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!dev-libs/openssl:0
-SLOT=0/43
-SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ecf77ccc912f709b8c16cd2eccda90e7
diff --git a/metadata/md5-cache/dev-libs/libressl-2.5.2 b/metadata/md5-cache/dev-libs/libressl-2.5.4
similarity index 98%
rename from metadata/md5-cache/dev-libs/libressl-2.5.2
rename to metadata/md5-cache/dev-libs/libressl-2.5.4
index d5eb1fa0a80e..ddb7a62aaeb7 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.5.2
+++ b/metadata/md5-cache/dev-libs/libressl-2.5.4
@@ -9,6 +9,6 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 SLOT=0/43
-SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.2.tar.gz
+SRC_URI=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=ecf77ccc912f709b8c16cd2eccda90e7
diff --git a/metadata/md5-cache/dev-perl/Class-Inspector-1.310.0 b/metadata/md5-cache/dev-perl/Class-Inspector-1.310.0
index f5c3028ef950..a66d7127bef5 100644
--- a/metadata/md5-cache/dev-perl/Class-Inspector-1.310.0
+++ b/metadata/md5-cache/dev-perl/Class-Inspector-1.310.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides information about Classes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Inspector/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.31.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=cbc24c3893f12753e51850115d70e66a
+_md5_=25abdbb538ddd80a2ce15bd22ff231b8
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.70.0 b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.70.0
deleted file mode 100644
index e16b9212a94e..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.70.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Data-Buffer-0.04 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-IO-Compress dev-perl/libwww-perl dev-perl/URI dev-perl/Crypt-DSA dev-perl/Crypt-RSA dev-perl/File-HomeDir dev-perl/Crypt-IDEA virtual/perl-Digest-MD5 dev-perl/Crypt-DES_EDE3 dev-perl/Digest-SHA1 dev-perl/Crypt-Rijndael dev-perl/Crypt-CAST5_PP dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Blowfish >=dev-perl/Crypt-Twofish-2.00 test? ( dev-perl/Test-Exception ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Pure-Perl OpenPGP-compatible PGP implementation
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Crypt-OpenPGP/
-IUSE=test
-KEYWORDS=amd64 x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Data-Buffer-0.04 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-IO-Compress dev-perl/libwww-perl dev-perl/URI dev-perl/Crypt-DSA dev-perl/Crypt-RSA dev-perl/File-HomeDir dev-perl/Crypt-IDEA virtual/perl-Digest-MD5 dev-perl/Crypt-DES_EDE3 dev-perl/Digest-SHA1 dev-perl/Crypt-Rijndael dev-perl/Crypt-CAST5_PP dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Blowfish >=dev-perl/Crypt-Twofish-2.00 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SR/SROMANOV/Crypt-OpenPGP-1.07.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=712aabf21440a9be409bcfbbc92eab68
diff --git a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0 b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
index 5ed04fbb2ddd..4c697b1af62f 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight HTTP Server
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Server-Simple/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI >=virtual/perl-Socket-1.940.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=97ffc4c3cb9c7dbef1749f79f9d4a526
+_md5_=29a25a8ff3b6db3060d927ec735f0dc4
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
index 3a8e6e6b20ad..2b1247073102 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils/
 IUSE=test +xs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( dev-perl/List-MoreUtils-XS )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.418.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f3ef6b762f2c9de82a4f5c269a0641c2
+_md5_=74ba7413962da6daa083c19441cada36
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
index ae1806c9633f..5cf415511dc2 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiled List::MoreUtils functions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils-XS/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.418.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b7343098287b8f29d1be7b9154cae077
+_md5_=acf10b5d23438a93c4228610ea3eeca2
diff --git a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0 b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
index 752e4aa9bad2..5078135b9c36 100644
--- a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
+++ b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lets you build groups of accessors
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MRO-Compat/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=71500240bbb593d6db61bbb9ca28bc9e
+_md5_=16c3b01c4d8562d832c13aaf5a23aaeb
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
index 7e2cac8c49e5..254b1f0bad1d 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
 IUSE=libressl test minimal examples examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.81.tar.gz
 _eclasses_=multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=84b40729f7cbf98b3a5b97086bb844c9
+_md5_=f59614699a8421aabc607cdbeb482511
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-1.126.0 b/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
index b62d004e8d48..c2fa8edd4e7c 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extremely flexible deep comparison testing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Deep/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Test-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.126.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6fb248a11b4dd056d75052c7dae631fd
+_md5_=b21eed1043cfcf9369e92261786a284e
diff --git a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0 b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
index ff46d85bcaf2..7df5b95d09b4 100644
--- a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
+++ b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module that offers a simple to process namespaced XML names
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-NamespaceSupport/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2590ff7630ce55882b220e21f4bc4231
+_md5_=95fefefcb4344ac9ad613bc27085031a
diff --git a/metadata/md5-cache/dev-php/phpunit-5.7.15 b/metadata/md5-cache/dev-php/phpunit-5.7.15-r1
similarity index 100%
rename from metadata/md5-cache/dev-php/phpunit-5.7.15
rename to metadata/md5-cache/dev-php/phpunit-5.7.15-r1
diff --git a/metadata/md5-cache/dev-php/symfony-config-2.8.19 b/metadata/md5-cache/dev-php/symfony-config-2.8.20
similarity index 62%
rename from metadata/md5-cache/dev-php/symfony-config-2.8.19
rename to metadata/md5-cache/dev-php/symfony-config-2.8.20
index 11dfd31edc17..1187405fb21a 100644
--- a/metadata/md5-cache/dev-php/symfony-config-2.8.19
+++ b/metadata/md5-cache/dev-php/symfony-config-2.8.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem dev-php/phpunit )
+DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem >=dev-php/phpunit-5.7.15 )
 DESCRIPTION=Symfony Config Component
 EAPI=6
 HOMEPAGE=https://github.com/symfony/config
@@ -7,7 +7,6 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem
-RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/symfony/config/archive/v2.8.19.tar.gz -> symfony-config-2.8.19.tar.gz
-_md5_=84458b6cbe16668d4f5ca1acd142600e
+SRC_URI=https://github.com/symfony/config/archive/v2.8.20.tar.gz -> symfony-config-2.8.20.tar.gz
+_md5_=a5c72c58a248fa691363785395e41e9e
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.3.1 b/metadata/md5-cache/dev-python/APScheduler-3.3.1
new file mode 100644
index 000000000000..3722d1f3de26
--- /dev/null
+++ b/metadata/md5-cache/dev-python/APScheduler-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-capturelog[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=In-process task scheduler with Cron-like capabilities
+EAPI=6
+HOMEPAGE=https://bitbucket.org/agronholm/apscheduler
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.3.1.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=35ae19521d9e9b23f4f35f4ba344a37f
diff --git a/metadata/md5-cache/dev-python/Babel-2.0 b/metadata/md5-cache/dev-python/Babel-2.0
deleted file mode 100644
index 352ad64fbd32..000000000000
--- a/metadata/md5-cache/dev-python/Babel-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( >=dev-python/pytest-2.3.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A collection of tools for internationalizing Python applications
-EAPI=5
-HOMEPAGE=http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/B/Babel/Babel-2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=fdb1a20de5fb1f6ee40e364206635e08
diff --git a/metadata/md5-cache/dev-python/Babel-2.2.0 b/metadata/md5-cache/dev-python/Babel-2.2.0
deleted file mode 100644
index 00738657581a..000000000000
--- a/metadata/md5-cache/dev-python/Babel-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A collection of tools for internationalizing Python applications
-EAPI=5
-HOMEPAGE=http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/B/Babel/Babel-2.2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4a4c67376a21c08a1fc6277b623b6c31
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.7.6 b/metadata/md5-cache/dev-python/PyContracts-1.7.6
deleted file mode 100644
index dfd31c7e3055..000000000000
--- a/metadata/md5-cache/dev-python/PyContracts-1.7.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/decorator[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Declare constraints on function parameters and return values
-EAPI=5
-HOMEPAGE=http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=dev-python/decorator[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.7.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=12fd5e71e457bbb71347a0c9d3e19fa2
diff --git a/metadata/md5-cache/dev-python/PySocks-1.5.7 b/metadata/md5-cache/dev-python/PySocks-1.5.7
deleted file mode 100644
index bd90c969ea0d..000000000000
--- a/metadata/md5-cache/dev-python/PySocks-1.5.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=SOCKS client module
-EAPI=6
-HOMEPAGE=https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySocks/PySocks-1.5.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=14de85dfaf0afc45c122dae3ab799fad
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.4 b/metadata/md5-cache/dev-python/PySocks-1.6.4
deleted file mode 100644
index 7d60dd6034eb..000000000000
--- a/metadata/md5-cache/dev-python/PySocks-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=SOCKS client module
-EAPI=6
-HOMEPAGE=https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=14de85dfaf0afc45c122dae3ab799fad
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.5 b/metadata/md5-cache/dev-python/PySocks-1.6.5
deleted file mode 100644
index 8e65c4897eba..000000000000
--- a/metadata/md5-cache/dev-python/PySocks-1.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=SOCKS client module
-EAPI=6
-HOMEPAGE=https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.5.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=14de85dfaf0afc45c122dae3ab799fad
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.6 b/metadata/md5-cache/dev-python/PySocks-1.6.6
deleted file mode 100644
index 914a5ec9206c..000000000000
--- a/metadata/md5-cache/dev-python/PySocks-1.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=SOCKS client module
-EAPI=6
-HOMEPAGE=https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5f1bf96d1c8eba19e62557976bdbff63
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.6 b/metadata/md5-cache/dev-python/alabaster-0.7.6
deleted file mode 100644
index 46704d62831f..000000000000
--- a/metadata/md5-cache/dev-python/alabaster-0.7.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A configurable sidebar-enabled Sphinx theme
-EAPI=5
-HOMEPAGE=https://github.com/bitprophet/alabaster
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9e4e5b56ee1697a109941bf0d5fb7e05
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.8 b/metadata/md5-cache/dev-python/alabaster-0.7.8
deleted file mode 100644
index f5fc50d47f5c..000000000000
--- a/metadata/md5-cache/dev-python/alabaster-0.7.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A configurable sidebar-enabled Sphinx theme
-EAPI=5
-HOMEPAGE=https://github.com/bitprophet/alabaster
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.8.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=49539b9b25ded301dacbb1d80e96ebac
diff --git a/metadata/md5-cache/dev-python/apipkg-1.2-r1 b/metadata/md5-cache/dev-python/apipkg-1.2-r1
deleted file mode 100644
index bc39e17e76d6..000000000000
--- a/metadata/md5-cache/dev-python/apipkg-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=namespace control and lazy-import mechanism
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/apipkg
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/a/apipkg/apipkg-1.2.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=60e8ab2205425dc1004b14fe9037ee58
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.0-r1 b/metadata/md5-cache/dev-python/appdirs-1.4.0-r1
deleted file mode 100644
index 8cdf06f770a8..000000000000
--- a/metadata/md5-cache/dev-python/appdirs-1.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Module for determining appropriate platform-specific dirs
-EAPI=6
-HOMEPAGE=https://github.com/ActiveState/appdirs
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c090803861c850561739b0b65aebc2a7
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.1 b/metadata/md5-cache/dev-python/appdirs-1.4.1
deleted file mode 100644
index dc139fa73f15..000000000000
--- a/metadata/md5-cache/dev-python/appdirs-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Module for determining appropriate platform-specific dirs
-EAPI=6
-HOMEPAGE=https://github.com/ActiveState/appdirs
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.1.tar.gz -> appdirs-1.4.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e82b303e893a3099e10ecf7a2f414d49
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.3.2 b/metadata/md5-cache/dev-python/beautifulsoup-4.3.2
deleted file mode 100644
index ee2c8a77fae0..000000000000
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
-EAPI=5
-HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ https://pypi.python.org/pypi/beautifulsoup4
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=4
-SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f2b7623389fdedbcfd3a9b6e924020ca
diff --git a/metadata/md5-cache/dev-python/bleach-1.4.3 b/metadata/md5-cache/dev-python/bleach-1.4.3
deleted file mode 100644
index edf072c84856..000000000000
--- a/metadata/md5-cache/dev-python/bleach-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/html5lib-0.999[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
-EAPI=5
-HOMEPAGE=https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/html5lib-0.999[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bleach/bleach-1.4.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=44f7f41e746d3935e1db01bc1ae29f97
diff --git a/metadata/md5-cache/dev-python/cachetools-2.0.0 b/metadata/md5-cache/dev-python/cachetools-2.0.0
new file mode 100644
index 000000000000..7d0fdafde10e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Extensible memoizing collections and decorators
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/cachetools
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-2.0.0.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=a9036fa6597a91fc41c6a0b2b0417fd7
diff --git a/metadata/md5-cache/dev-python/capturer-2.1 b/metadata/md5-cache/dev-python/capturer-2.1
deleted file mode 100644
index 1be12ebfae97..000000000000
--- a/metadata/md5-cache/dev-python/capturer-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Easily capture stdout/stderr of the current process and subprocesses
-EAPI=5
-HOMEPAGE=https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/c/capturer/capturer-2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b68f8fd3949e23cc2427a9437ecb3409
diff --git a/metadata/md5-cache/dev-python/capturer-2.1.1 b/metadata/md5-cache/dev-python/capturer-2.1.1
deleted file mode 100644
index e228a4c6d1cc..000000000000
--- a/metadata/md5-cache/dev-python/capturer-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Easily capture stdout/stderr of the current process and subprocesses
-EAPI=5
-HOMEPAGE=https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/c/capturer/capturer-2.1.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b68f8fd3949e23cc2427a9437ecb3409
diff --git a/metadata/md5-cache/dev-python/cffi-1.2.1 b/metadata/md5-cache/dev-python/cffi-1.2.1
deleted file mode 100644
index 1c364dd61f43..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=5
-HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0/1.2.1
-SRC_URI=mirror://pypi/c/cffi/cffi-1.2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=135958e6af86c50f8091f3b0c9a2507c
diff --git a/metadata/md5-cache/dev-python/cffi-1.6.0 b/metadata/md5-cache/dev-python/cffi-1.6.0
deleted file mode 100644
index 0f9b309e2eb7..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=6
-HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0/1.6.0
-SRC_URI=mirror://pypi/c/cffi/cffi-1.6.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=804d02681d148408be50e587ce6c02f8
diff --git a/metadata/md5-cache/dev-python/cffi-1.7.0 b/metadata/md5-cache/dev-python/cffi-1.7.0
deleted file mode 100644
index 7723a153ac87..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=6
-HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0/1.7.0
-SRC_URI=mirror://pypi/c/cffi/cffi-1.7.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=804d02681d148408be50e587ce6c02f8
diff --git a/metadata/md5-cache/dev-python/cffi-1.8.3 b/metadata/md5-cache/dev-python/cffi-1.8.3
deleted file mode 100644
index 8570e183a456..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=6
-HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0/1.8.3
-SRC_URI=mirror://pypi/c/cffi/cffi-1.8.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=804d02681d148408be50e587ce6c02f8
diff --git a/metadata/md5-cache/dev-python/chardet-2.2.1 b/metadata/md5-cache/dev-python/chardet-2.2.1
deleted file mode 100644
index 44e069692d16..000000000000
--- a/metadata/md5-cache/dev-python/chardet-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Universal encoding detector
-EAPI=5
-HOMEPAGE=https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/chardet/chardet-2.2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=40fb134fdd3dadf066d9bddb94d1c703
diff --git a/metadata/md5-cache/dev-python/coloredlogs-3.1.4 b/metadata/md5-cache/dev-python/coloredlogs-3.1.4
deleted file mode 100644
index 5e2118475218..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-3.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-3.1.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2a493d3ddc3c7c766b21c243d618b51e
diff --git a/metadata/md5-cache/dev-python/coloredlogs-5.0 b/metadata/md5-cache/dev-python/coloredlogs-5.0
deleted file mode 100644
index 9166dd446d0e..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/verboselogs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/humanfriendly-1.42[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-5.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=566c7a3c98a7001479daa86b6c831749
diff --git a/metadata/md5-cache/dev-python/couchdb-python-1.0 b/metadata/md5-cache/dev-python/couchdb-python-1.0
deleted file mode 100644
index 222b40de5d63..000000000000
--- a/metadata/md5-cache/dev-python/couchdb-python-1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python library for working with CouchDB
-EAPI=5
-HOMEPAGE=https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/C/CouchDB/CouchDB-1.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b6e1cb6c932b39f825986d13221fffd3
diff --git a/metadata/md5-cache/dev-python/couchdb-python-1.0.1 b/metadata/md5-cache/dev-python/couchdb-python-1.0.1
deleted file mode 100644
index 8fc4dcc0b7a9..000000000000
--- a/metadata/md5-cache/dev-python/couchdb-python-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python library for working with CouchDB
-EAPI=5
-HOMEPAGE=https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/C/CouchDB/CouchDB-1.0.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f1135e44cad4052d32a504c04c2dcdb3
diff --git a/metadata/md5-cache/dev-python/coverage-4.0.3 b/metadata/md5-cache/dev-python/coverage-4.0.3
deleted file mode 100644
index 57ebd848d044..000000000000
--- a/metadata/md5-cache/dev-python/coverage-4.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-18.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/PyContracts[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Code coverage measurement for Python
-EAPI=5
-HOMEPAGE=http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coverage/coverage-4.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0fb8dbd73525b1724547fdca0076e9cc
diff --git a/metadata/md5-cache/dev-python/coverage-4.1 b/metadata/md5-cache/dev-python/coverage-4.1
deleted file mode 100644
index f2931d9f6060..000000000000
--- a/metadata/md5-cache/dev-python/coverage-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-18.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/PyContracts[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Code coverage measurement for Python
-EAPI=5
-HOMEPAGE=http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/coverage/coverage-4.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7050c6bb03672a099ad91061b6a2d24a
diff --git a/metadata/md5-cache/dev-python/cryptography-1.3.4 b/metadata/md5-cache/dev-python/cryptography-1.3.4
deleted file mode 100644
index b3b076288d20..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-1.3.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Library providing cryptographic recipes and primitives
-EAPI=5
-HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
-IUSE=libressl test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cryptography/cryptography-1.3.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7be1bce0f69c30a2f7ca19689d899dc7
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4 b/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4
deleted file mode 100644
index 100e610b6b19..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Test vectors for the cryptography package
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-1.3.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9486392ec132f0665928a1feaa55e1dc
diff --git a/metadata/md5-cache/dev-python/cssselect-0.9.2 b/metadata/md5-cache/dev-python/cssselect-0.9.2
deleted file mode 100644
index 77f91d63349c..000000000000
--- a/metadata/md5-cache/dev-python/cssselect-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
-EAPI=5
-HOMEPAGE=http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cssselect/cssselect-0.9.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bcb3296e001d3c4564c42b0c77ca9f70
diff --git a/metadata/md5-cache/dev-python/cssselect-1.0.0 b/metadata/md5-cache/dev-python/cssselect-1.0.0
deleted file mode 100644
index 874e91c5bee8..000000000000
--- a/metadata/md5-cache/dev-python/cssselect-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
-EAPI=6
-HOMEPAGE=http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/c/cssselect/cssselect-1.0.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=475df387e91c6004f1fbbcb3cc3bd7fd
diff --git a/metadata/md5-cache/dev-python/cycler-0.9.0 b/metadata/md5-cache/dev-python/cycler-0.9.0
deleted file mode 100644
index 99f15590c594..000000000000
--- a/metadata/md5-cache/dev-python/cycler-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Composable style cycles
-EAPI=5
-HOMEPAGE=http://tacaswell.github.io/cycler/ https://pypi.python.org/pypi/Cycler/ https://github.com/matplotlib/cycler
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/C/Cycler/cycler-0.9.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2c5e96736d9df94fa9e5a7f8a1a6ec9a
diff --git a/metadata/md5-cache/dev-python/cython-0.25.1 b/metadata/md5-cache/dev-python/cython-0.25.1
deleted file mode 100644
index bde2e2f3e094..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) >=dev-python/setuptools-9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A Python to C compiler
-EAPI=6
-HOMEPAGE=http://cython.org https://pypi.python.org/pypi/Cython
-IUSE=doc emacs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cython/Cython-0.25.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=faab5fe5f9ca0f4f7d56cb93b2c85ac1
diff --git a/metadata/md5-cache/dev-python/docutils-0.12-r1 b/metadata/md5-cache/dev-python/docutils-0.12-r1
deleted file mode 100644
index 6540e607cb14..000000000000
--- a/metadata/md5-cache/dev-python/docutils-0.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python Documentation Utilities
-EAPI=6
-HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/docutils/docutils-0.12.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=13e99b7a66cab366aeab495b02b91947
diff --git a/metadata/md5-cache/dev-python/enum34-1.0.4 b/metadata/md5-cache/dev-python/enum34-1.0.4
deleted file mode 100644
index 5d65659378cf..000000000000
--- a/metadata/md5-cache/dev-python/enum34-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python 3.4 Enum backported
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/enum34
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/e/enum34/enum34-1.0.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c20dd9e83dc649fe9cb25af8e084cc39
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.2 b/metadata/md5-cache/dev-python/enum34-1.1.2
deleted file mode 100644
index d69dba22d5a2..000000000000
--- a/metadata/md5-cache/dev-python/enum34-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python 3.4 Enum backported
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/enum34
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/e/enum34/enum34-1.1.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=667a8201173b56e0534fec975a6926a5
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.3 b/metadata/md5-cache/dev-python/enum34-1.1.3
deleted file mode 100644
index c26266a1380c..000000000000
--- a/metadata/md5-cache/dev-python/enum34-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python 3.4 Enum backported
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/enum34
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/e/enum34/enum34-1.1.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d2337119c12b503a0ff7b47a8a2621ad
diff --git a/metadata/md5-cache/dev-python/eventlet-0.21.0 b/metadata/md5-cache/dev-python/eventlet-0.21.0
new file mode 100644
index 000000000000..c42ce91bc1fc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eventlet-0.21.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Highly concurrent networking library
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/e/eventlet/eventlet-0.21.0.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=f1632ffabd0c3f19a7afd28e3996a0a0
diff --git a/metadata/md5-cache/dev-python/execnet-1.2.0-r2 b/metadata/md5-cache/dev-python/execnet-1.2.0-r2
deleted file mode 100644
index 4a76b7972aae..000000000000
--- a/metadata/md5-cache/dev-python/execnet-1.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Rapid multi-Python deployment
-EAPI=5
-HOMEPAGE=http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/e/execnet/execnet-1.2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9f81dd0c460d135f4d6b46d210d3e627
diff --git a/metadata/md5-cache/dev-python/fabric-1.10.1 b/metadata/md5-cache/dev-python/fabric-1.10.1
deleted file mode 100644
index d2108bf21e22..000000000000
--- a/metadata/md5-cache/dev-python/fabric-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-docs-2.7.6-r1:2.7 dev-python/alabaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/fudge-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A simple pythonic tool for remote execution and deployment
-EAPI=5
-HOMEPAGE=http://fabfile.org https://pypi.python.org/pypi/Fabric
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/F/Fabric/Fabric-1.10.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=853ada85b0aac6db0210e6bcd19db46c
diff --git a/metadata/md5-cache/dev-python/fabric-1.10.2-r1 b/metadata/md5-cache/dev-python/fabric-1.10.2-r1
deleted file mode 100644
index 8ec5206846f7..000000000000
--- a/metadata/md5-cache/dev-python/fabric-1.10.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-docs-2.7.6-r1:2.7 dev-python/alabaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/fudge-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A simple pythonic tool for remote execution and deployment
-EAPI=6
-HOMEPAGE=http://fabfile.org https://pypi.python.org/pypi/Fabric
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/F/Fabric/Fabric-1.10.2.tar.gz https://raw.githubusercontent.com/kbakulin/fabric-completion/83d303e9fb352deaf4885b6db0781b3d9115e9c6/fabric-completion.bash -> fabric-1.10.2-completion.bash
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1ae28edc3b351378007e1bbc4cb760d7
diff --git a/metadata/md5-cache/dev-python/fabric-1.11.1 b/metadata/md5-cache/dev-python/fabric-1.11.1
deleted file mode 100644
index b99d4e5cd984..000000000000
--- a/metadata/md5-cache/dev-python/fabric-1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-docs-2.7.6-r1:2.7 dev-python/alabaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/fudge-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A simple pythonic tool for remote execution and deployment
-EAPI=6
-HOMEPAGE=http://fabfile.org https://pypi.python.org/pypi/Fabric
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/F/Fabric/Fabric-1.11.1.tar.gz https://raw.githubusercontent.com/kbakulin/fabric-completion/83d303e9fb352deaf4885b6db0781b3d9115e9c6/fabric-completion.bash -> fabric-1.11.1-completion.bash
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1ae28edc3b351378007e1bbc4cb760d7
diff --git a/metadata/md5-cache/dev-python/fasteners-0.14.1 b/metadata/md5-cache/dev-python/fasteners-0.14.1
index 0e8461daf929..4f990525eb4f 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.14.1
+++ b/metadata/md5-cache/dev-python/fasteners-0.14.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/monotonic-0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/monotonic-0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python package that provides useful locks
 EAPI=6
 HOMEPAGE=https://github.com/harlowja/fasteners
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/monotonic-0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=>=dev-python/monotonic-0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fasteners/fasteners-0.14.1.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=31c62840cd87b7e548fbc17b5953e7d3
+_md5_=a14979956ec6032b38d2a2f8a01d79d0
diff --git a/metadata/md5-cache/dev-python/flake8-2.4.1-r1 b/metadata/md5-cache/dev-python/flake8-2.4.1-r1
deleted file mode 100644
index 4167b4de4d8c..000000000000
--- a/metadata/md5-cache/dev-python/flake8-2.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=5
-HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-2.4.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0d5f2d478922637b06abd5016dab42ba
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.0 b/metadata/md5-cache/dev-python/flake8-2.5.0
deleted file mode 100644
index 7cdcdaca6bd8..000000000000
--- a/metadata/md5-cache/dev-python/flake8-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=5
-HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-2.5.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=838a8364ca0637e5cd2b46bec2f51479
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.1 b/metadata/md5-cache/dev-python/flake8-2.5.1
deleted file mode 100644
index 58ac76d8b430..000000000000
--- a/metadata/md5-cache/dev-python/flake8-2.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=5
-HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-2.5.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d57e085f626a947b9f94c151de17363d
diff --git a/metadata/md5-cache/dev-python/flake8-3.0.4-r2 b/metadata/md5-cache/dev-python/flake8-3.0.4-r2
deleted file mode 100644
index be9922712eb7..000000000000
--- a/metadata/md5-cache/dev-python/flake8-3.0.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mccabe-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=6
-HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-3.0.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=babebd0b5c0f806bc80948190b3197f1
diff --git a/metadata/md5-cache/dev-python/flake8-3.2.1 b/metadata/md5-cache/dev-python/flake8-3.2.1
deleted file mode 100644
index 1f0dccc7e31a..000000000000
--- a/metadata/md5-cache/dev-python/flake8-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyflakes-0.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mccabe-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=6
-HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyflakes-0.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-3.2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0ea8112c1aee56e94016359da38bd692
diff --git a/metadata/md5-cache/dev-python/flask-0.12.1 b/metadata/md5-cache/dev-python/flask-0.12.1
new file mode 100644
index 000000000000..6cbc20df63c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/blinker-1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/werkzeug-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/itsdangerous-0.21[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=6
+HOMEPAGE=https://github.com/pallets/flask/
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/blinker-1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/werkzeug-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/itsdangerous-0.21[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask/Flask-0.12.1.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=c79a0e359ad48d70404c2512c514df74
diff --git a/metadata/md5-cache/dev-python/fudge-1.0.3-r2 b/metadata/md5-cache/dev-python/fudge-1.0.3-r2
deleted file mode 100644
index 1b55c64ad26b..000000000000
--- a/metadata/md5-cache/dev-python/fudge-1.0.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Replace real objects with fakes (mocks, stubs, etc) while testing
-EAPI=5
-HOMEPAGE=http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/f/fudge/fudge-1.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0487961bd4f791f25d2d78eea7a0d62e
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.4 b/metadata/md5-cache/dev-python/gmpy-2.0.4
deleted file mode 100644
index f7547e6c6f28..000000000000
--- a/metadata/md5-cache/dev-python/gmpy-2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) app-arch/unzip doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
-EAPI=5
-HOMEPAGE=https://github.com/aleaxit/gmpy
-IUSE=doc mpir python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=2
-SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.4.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e726ec939c3a773fda7beb2f5f5f46f8
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.6 b/metadata/md5-cache/dev-python/gmpy-2.0.6
deleted file mode 100644
index 58b1cf6046b5..000000000000
--- a/metadata/md5-cache/dev-python/gmpy-2.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) app-arch/unzip doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
-EAPI=5
-HOMEPAGE=https://github.com/aleaxit/gmpy
-IUSE=doc mpir python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=2
-SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.6.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f20b3d4a03fd87bc9c9090991df7db39
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.7 b/metadata/md5-cache/dev-python/gmpy-2.0.7
deleted file mode 100644
index 227097aab5ba..000000000000
--- a/metadata/md5-cache/dev-python/gmpy-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) app-arch/unzip doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
-EAPI=5
-HOMEPAGE=https://github.com/aleaxit/gmpy
-IUSE=doc mpir python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=2
-SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.7.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=45db9cfd96f1294b8775ee35827faa29
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.2 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
new file mode 100644
index 000000000000..31d56624df3f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/google-auth-httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Google API Client for Python
+EAPI=5
+HOMEPAGE=https://github.com/google/google-api-python-client
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/google/google-api-python-client/archive/v1.6.2.tar.gz -> google-api-python-client-1.6.2.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=6a7c799d264f29975f0ce406a34da629
diff --git a/metadata/md5-cache/dev-python/google-auth-1.0.0 b/metadata/md5-cache/dev-python/google-auth-1.0.0
new file mode 100644
index 000000000000..bb79ad690676
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Google Authentication Library
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/google-auth/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.0.0.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=401a41449dc33000d9fa29c48c6c9930
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
new file mode 100644
index 000000000000..2a775494fa6c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=httplib2 Transport for Google Auth
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/607e86011141e8885b1f52826d57c8b5ff588ffc.tar.gz -> google-auth-httplib2-0.0.2.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=a2f9ee5baf7662f9fb0797e909ea643a
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.22 b/metadata/md5-cache/dev-python/hgdistver-0.22
deleted file mode 100644
index de13b4cdf3bb..000000000000
--- a/metadata/md5-cache/dev-python/hgdistver-0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=utility lib to generate python package version infos from mercurial tags
-EAPI=5
-HOMEPAGE=https://bitbucket.org/RonnyPfannschmidt/hgdistver/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.22.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c9dff9e5a14fa02e279d66c21bd7354a
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.44.1 b/metadata/md5-cache/dev-python/humanfriendly-1.44.1
deleted file mode 100644
index 7ff54cf285c6..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.44.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coloredlogs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.44.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=82e173c39451d36d240a09bdd88338d2
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.44.3 b/metadata/md5-cache/dev-python/humanfriendly-1.44.3
deleted file mode 100644
index acf65760b9f0..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.44.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coloredlogs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.44.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=82e173c39451d36d240a09bdd88338d2
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.44.7 b/metadata/md5-cache/dev-python/humanfriendly-1.44.7
deleted file mode 100644
index 3d9963f253b1..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.44.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coloredlogs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.44.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=82e173c39451d36d240a09bdd88338d2
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.4.0 b/metadata/md5-cache/dev-python/hyper-h2-2.4.0
deleted file mode 100644
index 157101673733..000000000000
--- a/metadata/md5-cache/dev-python/hyper-h2-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=HTTP/2 State-Machine based protocol implementation
-EAPI=6
-HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/h2/h2-2.4.0.tar.gz -> hyper-h2-2.4.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=09962e30f91147da88417fcf856f7e64
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.4.1 b/metadata/md5-cache/dev-python/hyper-h2-2.4.1
deleted file mode 100644
index f45800443c95..000000000000
--- a/metadata/md5-cache/dev-python/hyper-h2-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=HTTP/2 State-Machine based protocol implementation
-EAPI=6
-HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/h2/h2-2.4.1.tar.gz -> hyper-h2-2.4.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=09962e30f91147da88417fcf856f7e64
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.5.0 b/metadata/md5-cache/dev-python/hyper-h2-2.5.0
deleted file mode 100644
index f8c780c23263..000000000000
--- a/metadata/md5-cache/dev-python/hyper-h2-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=HTTP/2 State-Machine based protocol implementation
-EAPI=6
-HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/h/h2/h2-2.5.0.tar.gz -> hyper-h2-2.5.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4eae14da6434a147e4cb9ed550fe6057
diff --git a/metadata/md5-cache/dev-python/hypothesis-1.19.0 b/metadata/md5-cache/dev-python/hypothesis-1.19.0
deleted file mode 100644
index 2758545fce08..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-1.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A library for property based testing
-EAPI=5
-HOMEPAGE=https://github.com/DRMacIver/hypothesis
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MPL-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hypothesis/hypothesis-1.19.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=22f201e10d28492bf2362e5184908814
diff --git a/metadata/md5-cache/dev-python/idna-1.1 b/metadata/md5-cache/dev-python/idna-1.1
deleted file mode 100644
index 27206ea8944d..000000000000
--- a/metadata/md5-cache/dev-python/idna-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
-EAPI=5
-HOMEPAGE=https://github.com/kjd/idna
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/i/idna/idna-1.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1ee5fb4b60a18ce30ff4000b0175dfe2
diff --git a/metadata/md5-cache/dev-python/idna-2.1 b/metadata/md5-cache/dev-python/idna-2.1
deleted file mode 100644
index 437ab444c486..000000000000
--- a/metadata/md5-cache/dev-python/idna-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
-EAPI=5
-HOMEPAGE=https://github.com/kjd/idna
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/idna/idna-2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bd7c138a85f60500aa6124eca70bffe7
diff --git a/metadata/md5-cache/dev-python/idna-2.2 b/metadata/md5-cache/dev-python/idna-2.2
deleted file mode 100644
index f91f5d8df9ad..000000000000
--- a/metadata/md5-cache/dev-python/idna-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
-EAPI=6
-HOMEPAGE=https://github.com/kjd/idna
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/idna/idna-2.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=95e1f4a25235fb5c528a8adf656a4f64
diff --git a/metadata/md5-cache/dev-python/idna-2.4 b/metadata/md5-cache/dev-python/idna-2.4
deleted file mode 100644
index 24f1559730f7..000000000000
--- a/metadata/md5-cache/dev-python/idna-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
-EAPI=6
-HOMEPAGE=https://github.com/kjd/idna
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/idna/idna-2.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8457b4f9d19a1c2a770fd00b8a8224b0
diff --git a/metadata/md5-cache/dev-python/ipython-4.0.3 b/metadata/md5-cache/dev-python/ipython-4.0.3
deleted file mode 100644
index 2531d9b1f63e..000000000000
--- a/metadata/md5-cache/dev-python/ipython-4.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( app-text/dvipng dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-base/xorg-server[xvfb] ) doc? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=5
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-PDEPEND=smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt4? ( dev-python/qtconsole ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-4.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3652f52622d7574729f6d44862397091
diff --git a/metadata/md5-cache/dev-python/ipython-4.1.2 b/metadata/md5-cache/dev-python/ipython-4.1.2
deleted file mode 100644
index 5e4829e70a53..000000000000
--- a/metadata/md5-cache/dev-python/ipython-4.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( app-text/dvipng dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-base/xorg-server[xvfb] ) doc? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-PDEPEND=qt4? ( dev-python/qtconsole ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-4.1.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ae24ee71102f3a94ac6bf5ed8d6723d7
diff --git a/metadata/md5-cache/dev-python/ipython-4.2.0-r1 b/metadata/md5-cache/dev-python/ipython-4.2.0-r1
deleted file mode 100644
index 721ce2f3adfe..000000000000
--- a/metadata/md5-cache/dev-python/ipython-4.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( app-text/dvipng dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-base/xorg-server[xvfb] ) doc? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-PDEPEND=qt4? ( dev-python/qtconsole ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-4.2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=201988b48c7fe00ae62fced143e478ee
diff --git a/metadata/md5-cache/dev-python/ipython-5.1.0-r1 b/metadata/md5-cache/dev-python/ipython-5.1.0-r1
deleted file mode 100644
index 167e0ec6a31f..000000000000
--- a/metadata/md5-cache/dev-python/ipython-5.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( app-text/dvipng dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-base/xorg-server[xvfb] ) doc? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-PDEPEND=qt4? ( dev-python/qtconsole ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-5.1.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ccee091ad77e5d57ff71680fb333df04
diff --git a/metadata/md5-cache/dev-python/ipython-5.2.2 b/metadata/md5-cache/dev-python/ipython-5.2.2
deleted file mode 100644
index a8558a740d18..000000000000
--- a/metadata/md5-cache/dev-python/ipython-5.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( app-text/dvipng dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-base/xorg-server[xvfb] ) doc? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-PDEPEND=qt4? ( dev-python/qtconsole ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-5.2.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6d9e24ad0c2db5c43e2a34aa4271756a
diff --git a/metadata/md5-cache/dev-python/jedi-0.10.0 b/metadata/md5-cache/dev-python/jedi-0.10.0
deleted file mode 100644
index 087fba816f55..000000000000
--- a/metadata/md5-cache/dev-python/jedi-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Autocompletion library for Python
-EAPI=6
-HOMEPAGE=https://github.com/davidhalter/jedi
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/davidhalter/jedi/archive/v0.10.0.tar.gz -> jedi-0.10.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=decb0a2dcf77c031bd8aad3e05549eb5
diff --git a/metadata/md5-cache/dev-python/jinja-2.8.1 b/metadata/md5-cache/dev-python/jinja-2.8.1
deleted file mode 100644
index acf960642f0a..000000000000
--- a/metadata/md5-cache/dev-python/jinja-2.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A full-featured template engine for Python
-EAPI=5
-HOMEPAGE=http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2
-IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD
-RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/jinja:compat python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.8.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3f755e40521c298b8f2cac07eb847f21
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.6.0 b/metadata/md5-cache/dev-python/jsonschema-2.6.0
new file mode 100644
index 000000000000..e82be7efead6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-2.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/vcversioner-2.16.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.6.0.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=430fca232562621e0869308c53ab220c
diff --git a/metadata/md5-cache/dev-python/lxml-3.7.1 b/metadata/md5-cache/dev-python/lxml-3.7.1
deleted file mode 100644
index 371b0dadb601..000000000000
--- a/metadata/md5-cache/dev-python/lxml-3.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/cssselect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
-EAPI=6
-HOMEPAGE=http://lxml.de/ https://pypi.python.org/pypi/lxml/
-IUSE=doc examples +threads test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/l/lxml/lxml-3.7.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=df5f551d29be05535840b80ba10de522
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.3 b/metadata/md5-cache/dev-python/markdown-2.6.3
deleted file mode 100644
index f01e1b18ae0f..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytidylib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=5
-HOMEPAGE=http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown https://pythonhosted.org/Markdown/ https://github.com/waylan/Python-Markdown
-IUSE=doc test pygments python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=352f58ed7f3108fa8abd52c7935fcadd
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.4 b/metadata/md5-cache/dev-python/markdown-2.6.4
deleted file mode 100644
index 31e1f881a180..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytidylib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=5
-HOMEPAGE=http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown https://pythonhosted.org/Markdown/ https://github.com/waylan/Python-Markdown
-IUSE=doc test pygments python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=352f58ed7f3108fa8abd52c7935fcadd
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.6 b/metadata/md5-cache/dev-python/markdown-2.6.6
deleted file mode 100644
index a6656acb0fdc..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytidylib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=5
-HOMEPAGE=http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown https://pythonhosted.org/Markdown/ https://github.com/waylan/Python-Markdown
-IUSE=doc test pygments python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ca56d2f55ae4208a7089972a1ae08403
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.0 b/metadata/md5-cache/dev-python/matplotlib-1.5.0
deleted file mode 100644
index 34775eb62533..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.3.4 dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=5
-HOMEPAGE=http://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.5.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ae07f84b8aa934e6b3bddb9f7d5e98b8
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.1 b/metadata/md5-cache/dev-python/matplotlib-1.5.1
deleted file mode 100644
index 0cec2102a82e..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=5
-HOMEPAGE=http://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.5.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e281114638bc672b83a0562ed2bd2f09
diff --git a/metadata/md5-cache/dev-python/mccabe-0.3 b/metadata/md5-cache/dev-python/mccabe-0.3
deleted file mode 100644
index 767e80128e94..000000000000
--- a/metadata/md5-cache/dev-python/mccabe-0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a plugin for flake8
-EAPI=5
-HOMEPAGE=https://github.com/flintwork/mccabe
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mccabe/mccabe-0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=293442cfb00d8b66720af9edc0d964b1
diff --git a/metadata/md5-cache/dev-python/mccabe-0.3.1 b/metadata/md5-cache/dev-python/mccabe-0.3.1
deleted file mode 100644
index 2b8759494d50..000000000000
--- a/metadata/md5-cache/dev-python/mccabe-0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a plugin for flake8
-EAPI=5
-HOMEPAGE=https://github.com/flintwork/mccabe
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mccabe/mccabe-0.3.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ac49e28fac43c16f2665bf0cea6795b0
diff --git a/metadata/md5-cache/dev-python/mccabe-0.4.0 b/metadata/md5-cache/dev-python/mccabe-0.4.0
deleted file mode 100644
index 16c8fba87492..000000000000
--- a/metadata/md5-cache/dev-python/mccabe-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=flake8 plugin: McCabe complexity checker
-EAPI=6
-HOMEPAGE=https://github.com/PyCQA/mccabe
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mccabe/mccabe-0.4.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a24bdbb472e4c1ff69186de3cc9f1906
diff --git a/metadata/md5-cache/dev-python/mccabe-0.5.2 b/metadata/md5-cache/dev-python/mccabe-0.5.2
deleted file mode 100644
index a8f4326b6ba5..000000000000
--- a/metadata/md5-cache/dev-python/mccabe-0.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=flake8 plugin: McCabe complexity checker
-EAPI=6
-HOMEPAGE=https://github.com/PyCQA/mccabe
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mccabe/mccabe-0.5.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=fdbd0cb7e0656aab8d0b40f95ac534e0
diff --git a/metadata/md5-cache/dev-python/mccabe-0.5.3 b/metadata/md5-cache/dev-python/mccabe-0.5.3
deleted file mode 100644
index d3f13d78da51..000000000000
--- a/metadata/md5-cache/dev-python/mccabe-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=flake8 plugin: McCabe complexity checker
-EAPI=6
-HOMEPAGE=https://github.com/PyCQA/mccabe
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mccabe/mccabe-0.5.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7105d9a17702bfa7bfa95d89c229b1c3
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r2 b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r2
deleted file mode 100644
index 5eadecd7c8c4..000000000000
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Basic functions for handling mime-types in python
-EAPI=6
-HOMEPAGE=https://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2a29ce942b7dd8c2b686822693da29cb
diff --git a/metadata/md5-cache/dev-python/mimeparse-1.5.2-r1 b/metadata/md5-cache/dev-python/mimeparse-1.5.2-r1
deleted file mode 100644
index 2dedb913b6ee..000000000000
--- a/metadata/md5-cache/dev-python/mimeparse-1.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Basic functions for handling mime-types in python
-EAPI=6
-HOMEPAGE=https://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.5.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2a29ce942b7dd8c2b686822693da29cb
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r2 b/metadata/md5-cache/dev-python/nose-1.3.7-r2
deleted file mode 100644
index 79da945ed9af..000000000000
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python2_7? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose
-IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2874d0ab0f5c6cff3b922b72943b47b2
diff --git a/metadata/md5-cache/dev-python/numpy-1.10.1-r1 b/metadata/md5-cache/dev-python/numpy-1.10.1-r1
deleted file mode 100644
index 899e03883a6e..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=5
-HOMEPAGE=http://www.numpy.org/
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.10.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.9.1/numpy-html-1.9.1.zip http://docs.scipy.org/doc/numpy-1.9.1/numpy-ref-1.9.1.pdf http://docs.scipy.org/doc/numpy-1.9.1/numpy-user-1.9.1.pdf )
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=01afc30bb9ecdf4404fc9b07f293db8c
diff --git a/metadata/md5-cache/dev-python/numpy-1.10.2-r2 b/metadata/md5-cache/dev-python/numpy-1.10.2-r2
deleted file mode 100644
index 5876b5d2ce7b..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.10.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=5
-HOMEPAGE=http://www.numpy.org/
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.10.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.10.1/numpy-html-1.10.1.zip http://docs.scipy.org/doc/numpy-1.10.1/numpy-ref-1.10.1.pdf http://docs.scipy.org/doc/numpy-1.10.1/numpy-user-1.10.1.pdf )
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e9c3e8f3c5fe2bd3be026ba9926916e2
diff --git a/metadata/md5-cache/dev-python/numpy-1.11.2-r1 b/metadata/md5-cache/dev-python/numpy-1.11.2-r1
deleted file mode 100644
index ea6373cd598f..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.11.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lapack? ( virtual/cblas virtual/lapack ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=6
-HOMEPAGE=http://www.numpy.org/
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.11.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.11.0/numpy-html-1.11.0.zip http://docs.scipy.org/doc/numpy-1.11.0/numpy-ref-1.11.0.pdf http://docs.scipy.org/doc/numpy-1.11.0/numpy-user-1.11.0.pdf )
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7c8715b2abc7fa421788203f97443c3f
diff --git a/metadata/md5-cache/dev-python/numpy-1.9.3 b/metadata/md5-cache/dev-python/numpy-1.9.3
deleted file mode 100644
index 05ca0f44031b..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=5
-HOMEPAGE=http://numpy.scipy.org/
-IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.9.3.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.9.1/numpy-html-1.9.1.zip http://docs.scipy.org/doc/numpy-1.9.1/numpy-ref-1.9.1.pdf http://docs.scipy.org/doc/numpy-1.9.1/numpy-user-1.9.1.pdf )
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ca68eda772925af861cb6aff6f4ad678
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.4-r1 b/metadata/md5-cache/dev-python/numpydoc-0.4-r1
deleted file mode 100644
index 44edb85d4257..000000000000
--- a/metadata/md5-cache/dev-python/numpydoc-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Sphinx extension to support docstrings in Numpy format
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/numpydoc
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ee860bbb5ff3a75791d6be89fab77e63
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.5 b/metadata/md5-cache/dev-python/numpydoc-0.5
deleted file mode 100644
index 8990173e798c..000000000000
--- a/metadata/md5-cache/dev-python/numpydoc-0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/matplotlib-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Sphinx extension to support docstrings in Numpy format
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/numpydoc
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.5.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c4ca493d3ca7d144a38582bef77df43e
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.0.0 b/metadata/md5-cache/dev-python/oauth2client-4.0.0
new file mode 100644
index 000000000000..933e0bd582a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oauth2client-4.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Library for accessing resources protected by OAuth 2.0
+EAPI=6
+HOMEPAGE=https://github.com/google/oauth2client
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/oauth2client/archive/v4.0.0.tar.gz -> oauth2client-4.0.0.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=4223ce93c40192c0997a4fe2d6458c44
diff --git a/metadata/md5-cache/dev-python/paramiko-2.0.2 b/metadata/md5-cache/dev-python/paramiko-2.0.2
deleted file mode 100644
index 94c9c0e78115..000000000000
--- a/metadata/md5-cache/dev-python/paramiko-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=SSH2 protocol library
-EAPI=6
-HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/paramiko/paramiko-2.0.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b04c2897dd88c1744bb6f2551b5e5445
diff --git a/metadata/md5-cache/dev-python/paramiko-2.1.1 b/metadata/md5-cache/dev-python/paramiko-2.1.1
deleted file mode 100644
index dbabcf0391b8..000000000000
--- a/metadata/md5-cache/dev-python/paramiko-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=SSH2 protocol library
-EAPI=6
-HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/paramiko/paramiko-2.1.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b04c2897dd88c1744bb6f2551b5e5445
diff --git a/metadata/md5-cache/dev-python/pep8-1.6.1 b/metadata/md5-cache/dev-python/pep8-1.6.1
deleted file mode 100644
index c162b087f9ab..000000000000
--- a/metadata/md5-cache/dev-python/pep8-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python style guide checker
-EAPI=5
-HOMEPAGE=https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pep8/pep8-1.6.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=45609f359fc6341570f71b2eddebe6bd
diff --git a/metadata/md5-cache/dev-python/pep8-1.6.2 b/metadata/md5-cache/dev-python/pep8-1.6.2
deleted file mode 100644
index 2f73ff9c5173..000000000000
--- a/metadata/md5-cache/dev-python/pep8-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python style guide checker
-EAPI=5
-HOMEPAGE=https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pep8/pep8-1.6.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=dd7b413d7cacf3ad9995ad1c4d2c611b
diff --git a/metadata/md5-cache/dev-python/pep8-1.6.2-r1 b/metadata/md5-cache/dev-python/pep8-1.6.2-r1
deleted file mode 100644
index ff4fb8c6f156..000000000000
--- a/metadata/md5-cache/dev-python/pep8-1.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python style guide checker
-EAPI=5
-HOMEPAGE=https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pep8/pep8-1.6.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c23b21de604092cac893d5a58e8ccded
diff --git a/metadata/md5-cache/dev-python/priority-1.2.0 b/metadata/md5-cache/dev-python/priority-1.2.0
deleted file mode 100644
index 654e9b6583be..000000000000
--- a/metadata/md5-cache/dev-python/priority-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
-EAPI=6
-HOMEPAGE=http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/priority/priority-1.2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bffe2b35fd3c49c253c21c8aa7ef3113
diff --git a/metadata/md5-cache/dev-python/priority-1.2.1 b/metadata/md5-cache/dev-python/priority-1.2.1
deleted file mode 100644
index c2e81bed6317..000000000000
--- a/metadata/md5-cache/dev-python/priority-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
-EAPI=6
-HOMEPAGE=http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/priority/priority-1.2.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bffe2b35fd3c49c253c21c8aa7ef3113
diff --git a/metadata/md5-cache/dev-python/priority-1.2.2 b/metadata/md5-cache/dev-python/priority-1.2.2
deleted file mode 100644
index 1d19aae82bf8..000000000000
--- a/metadata/md5-cache/dev-python/priority-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
-EAPI=6
-HOMEPAGE=http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/priority/priority-1.2.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=04894d00903beb22b10f4996f7a55b0e
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.13 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.13
deleted file mode 100644
index 0a5330fe97af..000000000000
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Building powerful interactive command lines in Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.13.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4d1a01f552d59a286921804c6035401b
diff --git a/metadata/md5-cache/dev-python/py-1.4.31 b/metadata/md5-cache/dev-python/py-1.4.31
deleted file mode 100644
index 5cd8e4efc739..000000000000
--- a/metadata/md5-cache/dev-python/py-1.4.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
-EAPI=5
-HOMEPAGE=http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/py/py-1.4.31.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2cb9ac3afe502bb449642769a897bf7c
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.1.7 b/metadata/md5-cache/dev-python/pyasn1-0.1.7
deleted file mode 100644
index e196f4762ffc..000000000000
--- a/metadata/md5-cache/dev-python/pyasn1-0.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=ASN.1 library for Python
-EAPI=5
-HOMEPAGE=http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.1.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9d5fb3e3bc97e80bac071d475882e29c
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.1.9 b/metadata/md5-cache/dev-python/pyasn1-0.1.9
deleted file mode 100644
index 232c5314db1e..000000000000
--- a/metadata/md5-cache/dev-python/pyasn1-0.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=ASN.1 library for Python
-EAPI=5
-HOMEPAGE=http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.1.9.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c236e3123ce50176ef20da08203b1ee6
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.6 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.6
deleted file mode 100644
index 46549827a85a..000000000000
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=pyasn1 modules
-EAPI=5
-HOMEPAGE=http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.0.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8ad2bfcdfd1821d6d584cbf28965a2bf
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.7 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.7
deleted file mode 100644
index 8aba9cc2e616..000000000000
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=pyasn1 modules
-EAPI=5
-HOMEPAGE=http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.0.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8ad2bfcdfd1821d6d584cbf28965a2bf
diff --git a/metadata/md5-cache/dev-python/pycparser-2.16-r1 b/metadata/md5-cache/dev-python/pycparser-2.16-r1
deleted file mode 100644
index 5f06f84c4c1d..000000000000
--- a/metadata/md5-cache/dev-python/pycparser-2.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test unpack
-DEPEND=dev-python/ply[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=C parser and AST generator written in Python
-EAPI=6
-HOMEPAGE=https://github.com/eliben/pycparser
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=BSD
-RDEPEND=dev-python/ply[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycparser/pycparser-2.16.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f04f9aa92ae48806a250b48f78b33ab6
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6.1 b/metadata/md5-cache/dev-python/pycrypto-2.6.1
deleted file mode 100644
index 0e78fdfdfd0a..000000000000
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-libs/gmp:0= ) doc? ( dev-python/docutils >=dev-python/epydoc-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python Cryptography Toolkit
-EAPI=5
-HOMEPAGE=http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto
-IUSE=doc +gmp python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
-LICENSE=PSF-2 public-domain
-RDEPEND=gmp? ( dev-libs/gmp:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=367ab63e275f2813d5e0f82aeb386975
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r1 b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r1
deleted file mode 100644
index 755984b4050c..000000000000
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-libs/gmp:0= ) doc? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/epydoc-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python Cryptography Toolkit
-EAPI=5
-HOMEPAGE=http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto
-IUSE=doc +gmp test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
-LICENSE=PSF-2 public-domain
-RDEPEND=gmp? ( dev-libs/gmp:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=test? ( gmp ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=730365cd59b9e4fd215af4d76549ea69
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2 b/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2
deleted file mode 100644
index cdc0e68eae3b..000000000000
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/fltk-1.3.0:1[opengl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python interface to Fltk library
-EAPI=5
-HOMEPAGE=http://pyfltk.sourceforge.net/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4aa1f642dfc1e95b5f97e554249cfc4b
diff --git a/metadata/md5-cache/dev-python/pygments-2.1.3 b/metadata/md5-cache/dev-python/pygments-2.1.3
deleted file mode 100644
index ebc60524c19e..000000000000
--- a/metadata/md5-cache/dev-python/pygments-2.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/ttf-fonts ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Pygments is a syntax highlighting package written in Python
-EAPI=6
-HOMEPAGE=http://pygments.org/ https://pypi.python.org/pypi/Pygments
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pygments/Pygments-2.1.3.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7503dd087ff4024348fa6d4aa166f8dc
diff --git a/metadata/md5-cache/dev-python/pymongo-2.6.3 b/metadata/md5-cache/dev-python/pymongo-2.6.3
deleted file mode 100644
index f4e5b16309b7..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-2.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-db/mongodb dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=5
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos mod_wsgi test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/mongodb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-2.6.3.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e758029353b144bab9a2811e1d045cab
diff --git a/metadata/md5-cache/dev-python/pymongo-2.8.1 b/metadata/md5-cache/dev-python/pymongo-2.8.1
deleted file mode 100644
index 654389c59c75..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-2.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-db/mongodb-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=5
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-2.8.1.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=471c04b9fd926338e493f66bc1c848da
diff --git a/metadata/md5-cache/dev-python/pymongo-3.0.3 b/metadata/md5-cache/dev-python/pymongo-3.0.3
deleted file mode 100644
index cf431d680762..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-db/mongodb-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=5
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-3.0.3.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=471c04b9fd926338e493f66bc1c848da
diff --git a/metadata/md5-cache/dev-python/pymongo-3.1.1 b/metadata/md5-cache/dev-python/pymongo-3.1.1
deleted file mode 100644
index 75dc23e62970..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-db/mongodb-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=5
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=Apache-2.0
-RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-3.1.1.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=471c04b9fd926338e493f66bc1c848da
diff --git a/metadata/md5-cache/dev-python/pymongo-3.2.2 b/metadata/md5-cache/dev-python/pymongo-3.2.2
deleted file mode 100644
index ec277c4ceccd..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-db/mongodb-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=6
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~hppa x86
-LICENSE=Apache-2.0
-RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-3.2.2.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0d3970529f192f8e57d8d257fad893fb
diff --git a/metadata/md5-cache/dev-python/pymongo-3.3.0 b/metadata/md5-cache/dev-python/pymongo-3.3.0
deleted file mode 100644
index 7b3ccfe6223a..000000000000
--- a/metadata/md5-cache/dev-python/pymongo-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-db/mongodb-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python driver for MongoDB
-EAPI=6
-HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~hppa x86
-LICENSE=Apache-2.0
-RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-3.3.0.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0d3970529f192f8e57d8d257fad893fb
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.0.2-r1 b/metadata/md5-cache/dev-python/pyopengl-3.0.2-r1
deleted file mode 100644
index 01f1098c14e7..000000000000
--- a/metadata/md5-cache/dev-python/pyopengl-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python OpenGL bindings
-EAPI=5
-HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL
-IUSE=tk python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.0.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a5663b4bc837a77f371effc8291687ef
diff --git a/metadata/md5-cache/dev-python/pyopenssl-16.1.0 b/metadata/md5-cache/dev-python/pyopenssl-16.1.0
deleted file mode 100644
index 12624a4c33bd..000000000000
--- a/metadata/md5-cache/dev-python/pyopenssl-16.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python interface to the OpenSSL library
-EAPI=5
-HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL
-IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-16.1.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ebafc07fa8c894948bd2abe458fff362
diff --git a/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2 b/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
deleted file mode 100644
index 12fd3cddd4b7..000000000000
--- a/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Easy-to-use Python module for text parsing
-EAPI=5
-HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyparsing/pyparsing-1.5.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f8f829893b798d37d38126dd299527b7
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.1.8 b/metadata/md5-cache/dev-python/pyparsing-2.1.8
deleted file mode 100644
index 6cc5be097aee..000000000000
--- a/metadata/md5-cache/dev-python/pyparsing-2.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Easy-to-use Python module for text parsing
-EAPI=6
-HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
-IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.1.8.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e43946ee259cc7ef9237855042855612
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.11 b/metadata/md5-cache/dev-python/pyquery-1.2.11
deleted file mode 100644
index 77ceedb9dd79..000000000000
--- a/metadata/md5-cache/dev-python/pyquery-1.2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip test? ( >=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/beautifulsoup[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/webtest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A jQuery-like library for python
-EAPI=5
-HOMEPAGE=https://github.com/gawel/pyquery
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.11.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=941a533dfc5210b2cbab6521c8f328cb
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9 b/metadata/md5-cache/dev-python/pyquery-1.2.9
deleted file mode 100644
index 97aab451164a..000000000000
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-arch/unzip test? ( >=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/webtest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A jQuery-like library for python
-EAPI=5
-HOMEPAGE=https://github.com/gawel/pyquery
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.9.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c2d6871b4e89bfe8b5f78b8f2052e28f
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9-r1 b/metadata/md5-cache/dev-python/pyquery-1.2.9-r1
deleted file mode 100644
index 4e67bafb96da..000000000000
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-arch/unzip test? ( >=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/webtest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A jQuery-like library for python
-EAPI=5
-HOMEPAGE=https://github.com/gawel/pyquery
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.9.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4972a664511de02f849af592974886ad
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.11.13 b/metadata/md5-cache/dev-python/pyrsistent-0.11.13
deleted file mode 100644
index e595e6534560..000000000000
--- a/metadata/md5-cache/dev-python/pyrsistent-0.11.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Persistent/Functional/Immutable data structures
-EAPI=6
-HOMEPAGE=https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.11.13.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e438d615253f71f25704e62c86e16e19
diff --git a/metadata/md5-cache/dev-python/pyserial-3.1.1 b/metadata/md5-cache/dev-python/pyserial-3.1.1
deleted file mode 100644
index bdce8fe9a4c3..000000000000
--- a/metadata/md5-cache/dev-python/pyserial-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python Serial Port extension
-EAPI=5
-HOMEPAGE=https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial
-IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyserial/pyserial-3.1.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8c5c18deb1183c484873ef9e95bda89d
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.5 b/metadata/md5-cache/dev-python/pytest-3.0.5
deleted file mode 100644
index d0bc548cf74a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/pytest-xdist-1.13[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Simple powerful testing with Python
-EAPI=6
-HOMEPAGE=http://pytest.org/ https://pypi.python.org/pypi/pytest
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !dev-python/logilab-common python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-3.0.5.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=42a7a5cd68c4a85783216cebb5cb5092
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7 b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
index 7b9b57dad079..8a7e16a2de97 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/werkzeug-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( >=dev-python/werkzeug-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Py.test plugin to test server connections locally
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/pytest-localserver
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/werkzeug-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/werkzeug-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.3.7.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ef3560488e67c11050d69500f6846e6d
+_md5_=deae3d1536021cdf2e34ba7e27bbd401
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.8 b/metadata/md5-cache/dev-python/pytest-runner-2.8
deleted file mode 100644
index 87f420415d41..000000000000
--- a/metadata/md5-cache/dev-python/pytest-runner-2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Adds support for tests during installation of setup.py files
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytest-dev/pytest-runner
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-2.8.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=aa6500ade3c4950733dd95ecb40298ce
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.9 b/metadata/md5-cache/dev-python/pytest-runner-2.9
deleted file mode 100644
index 4a04da8782a8..000000000000
--- a/metadata/md5-cache/dev-python/pytest-runner-2.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Adds support for tests during installation of setup.py files
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytest-dev/pytest-runner
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-2.9.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=aa6500ade3c4950733dd95ecb40298ce
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-0.4 b/metadata/md5-cache/dev-python/pytest-timeout-0.4
deleted file mode 100644
index dab153dd6594..000000000000
--- a/metadata/md5-cache/dev-python/pytest-timeout-0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=py.test plugin to abort hanging tests
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-timeout
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-0.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=adfcfe399e1c7a48e1226e5cc11486b7
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.0.0 b/metadata/md5-cache/dev-python/pytest-timeout-1.0.0
deleted file mode 100644
index e8776c671f08..000000000000
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=py.test plugin to abort hanging tests
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-timeout
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.0.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e60a12ccd8ce532069b4c6af8013f186
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.13.1 b/metadata/md5-cache/dev-python/pytest-xdist-1.13.1
deleted file mode 100644
index 87bec78ada78..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-xdist https://bitbucket.org/pytest-dev/pytest-xdist
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.13.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=287f83a697c0eec9a206efe9e89be071
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.14 b/metadata/md5-cache/dev-python/pytest-xdist-1.14
deleted file mode 100644
index 25d0c1737428..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.14.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=360a3da6624b003f286306060f15dccc
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.5.3 b/metadata/md5-cache/dev-python/python-dateutil-2.5.3
deleted file mode 100644
index a7ec3399ce26..000000000000
--- a/metadata/md5-cache/dev-python/python-dateutil-2.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Extensions to the standard Python datetime module
-EAPI=6
-HOMEPAGE=https://dateutil.readthedocs.org/ https://pypi.python.org/pypi/python-dateutil https://github.com/dateutil/dateutil/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.5.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d9c7356d63e94f8903ebf10dfa5f1c23
diff --git a/metadata/md5-cache/dev-python/python-engineio-0.9.1 b/metadata/md5-cache/dev-python/python-engineio-0.9.1
deleted file mode 100644
index 7063211b5b89..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-0.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=5
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-engineio/python-engineio-0.9.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c2988edfddc2c811476d4a5cd3799d7d
diff --git a/metadata/md5-cache/dev-python/python-engineio-1.0.3 b/metadata/md5-cache/dev-python/python-engineio-1.0.3
deleted file mode 100644
index a64b6d117587..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=5
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-engineio/python-engineio-1.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c2988edfddc2c811476d4a5cd3799d7d
diff --git a/metadata/md5-cache/dev-python/python-engineio-1.1.1 b/metadata/md5-cache/dev-python/python-engineio-1.1.1
deleted file mode 100644
index a6672e6b519a..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=5
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-engineio/python-engineio-1.1.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6835cf93779c195e08a489b6949eb444
diff --git a/metadata/md5-cache/dev-python/python-engineio-1.3.2 b/metadata/md5-cache/dev-python/python-engineio-1.3.2
deleted file mode 100644
index c910fb473ab7..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=6
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-engineio/python-engineio-1.3.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7b8278eeeea25fca3b81f8ab3f294421
diff --git a/metadata/md5-cache/dev-python/pytz-2015.6 b/metadata/md5-cache/dev-python/pytz-2015.6
deleted file mode 100644
index 7476952245f2..000000000000
--- a/metadata/md5-cache/dev-python/pytz-2015.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-libs/timezone-data-2014i python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=World timezone definitions for Python
-EAPI=5
-HOMEPAGE=http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-libs/timezone-data-2014i python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytz/pytz-2015.6.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f4cb2b7b5c69e1a0a63d5b6a898c6866
diff --git a/metadata/md5-cache/dev-python/pytz-2016.10 b/metadata/md5-cache/dev-python/pytz-2016.10
deleted file mode 100644
index 8749e9623ce7..000000000000
--- a/metadata/md5-cache/dev-python/pytz-2016.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=World timezone definitions for Python
-EAPI=6
-HOMEPAGE=http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytz/pytz-2016.10.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=62babb4dfeb40ce05e79360d68623d03
diff --git a/metadata/md5-cache/dev-python/pytz-2016.7 b/metadata/md5-cache/dev-python/pytz-2016.7
deleted file mode 100644
index b496c039f0da..000000000000
--- a/metadata/md5-cache/dev-python/pytz-2016.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=World timezone definitions for Python
-EAPI=6
-HOMEPAGE=http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytz/pytz-2016.7.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=62babb4dfeb40ce05e79360d68623d03
diff --git a/metadata/md5-cache/dev-python/readme-0.5.1 b/metadata/md5-cache/dev-python/readme-0.5.1
deleted file mode 100644
index e66fcc63441e..000000000000
--- a/metadata/md5-cache/dev-python/readme-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/bleach[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
-EAPI=5
-HOMEPAGE=https://github.com/pypa/readme https://pypi.python.org/pypi/readme
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/bleach[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/readme/readme-0.5.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bbe41aa1eed44babe1fd4c6824315d05
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 7dad804aac21..b8377b559fad 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Alternative regular expression module to replace re
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2017.04.05.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0414563879859d3ac1ed00d3615d70f8
+_md5_=c9f5615163e2c0604a0126e9230cfac7
diff --git a/metadata/md5-cache/dev-python/requests-2.12.4 b/metadata/md5-cache/dev-python/requests-2.12.4
deleted file mode 100644
index 504d4c7a9e1c..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.8.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.12.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2997509e36efa38a7683f3cc3171d4f9
diff --git a/metadata/md5-cache/dev-python/requests-2.7.0 b/metadata/md5-cache/dev-python/requests-2.7.0
deleted file mode 100644
index 91c9307300bb..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=5
-HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.7.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b95b10f58ee2b2820fe210e3e383a07d
diff --git a/metadata/md5-cache/dev-python/requests-2.9.1-r2 b/metadata/md5-cache/dev-python/requests-2.9.1-r2
deleted file mode 100644
index ff0f8bb1d760..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.13.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.8.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=5
-HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.13.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.9.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a86ec001cac1feb8e9405ac6a3155a93
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index 511a6ab30b5e..a8af100b99be 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.7
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=python_targets_pypy? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=5
 HOMEPAGE=https://github.com/dgerber/rfc3987 http://pypi.python.org/pypi/rfc3987
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_pypy? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/regex[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.7.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5058a7b69b4afaa06656be9c1d471172
+_md5_=4c860a39d7a8e7b67d0b1887b7b2be0c
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.2 b/metadata/md5-cache/dev-python/rpy-2.7.2
deleted file mode 100644
index 1461b2349f12..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=5
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1515fdac89e617026c896fbfb326316e
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.3 b/metadata/md5-cache/dev-python/rpy-2.7.3
deleted file mode 100644
index 312d1801a251..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=5
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1515fdac89e617026c896fbfb326316e
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.4 b/metadata/md5-cache/dev-python/rpy-2.7.4
deleted file mode 100644
index 6462416ead3e..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=5
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=89150fe03d54ed70e510f699f62a7107
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.5 b/metadata/md5-cache/dev-python/rpy-2.7.5
deleted file mode 100644
index 59ff7c95682e..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=5
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.5.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=89150fe03d54ed70e510f699f62a7107
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.6 b/metadata/md5-cache/dev-python/rpy-2.7.6
deleted file mode 100644
index 96338e02cef2..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=5
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=89150fe03d54ed70e510f699f62a7107
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.7 b/metadata/md5-cache/dev-python/rpy-2.7.7
deleted file mode 100644
index b763da313647..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=6
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=85fbc48a85faaf9c49edf6facbac70ca
diff --git a/metadata/md5-cache/dev-python/rpy-2.7.8 b/metadata/md5-cache/dev-python/rpy-2.7.8
deleted file mode 100644
index ad338233e9ce..000000000000
--- a/metadata/md5-cache/dev-python/rpy-2.7.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to the R Programming Language
-EAPI=6
-HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rpy2/rpy2-2.7.8.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=85fbc48a85faaf9c49edf6facbac70ca
diff --git a/metadata/md5-cache/dev-python/setuptools-18.4 b/metadata/md5-cache/dev-python/setuptools-18.4
deleted file mode 100644
index bb88bba1b4e5..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-18.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-15.3-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=PSF-2
-PDEPEND=>=dev-python/certifi-2015.04.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=>=dev-python/packaging-15.3-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-18.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=160dd91163208e6ca4cc9bb48fc8b2f9
diff --git a/metadata/md5-cache/dev-python/setuptools-20.6.7 b/metadata/md5-cache/dev-python/setuptools-20.6.7
deleted file mode 100644
index 8442ec5fb135..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-20.6.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2015.11.20[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-20.6.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=acc4251192fa7dfcefac26961db2335c
diff --git a/metadata/md5-cache/dev-python/setuptools-33.1.1 b/metadata/md5-cache/dev-python/setuptools-33.1.1
deleted file mode 100644
index 4917687c0584..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-33.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-33.1.1.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c1c78736dafa5b143b23724f3ad548f2
diff --git a/metadata/md5-cache/dev-python/setuptools-34.3.2 b/metadata/md5-cache/dev-python/setuptools-34.3.2
deleted file mode 100644
index a3042c9eee4c..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-34.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-34.3.2.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3acfb882fd32b165b421d76345bd279a
diff --git a/metadata/md5-cache/dev-python/setuptools-34.3.3 b/metadata/md5-cache/dev-python/setuptools-34.3.3
deleted file mode 100644
index 19536cc6597b..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-34.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-34.3.3.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3acfb882fd32b165b421d76345bd279a
diff --git a/metadata/md5-cache/dev-python/setuptools-34.4.1 b/metadata/md5-cache/dev-python/setuptools-34.4.1
deleted file mode 100644
index 7eee7d0dae10..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-34.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-34.4.1.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3acfb882fd32b165b421d76345bd279a
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.10.0 b/metadata/md5-cache/dev-python/setuptools_scm-1.10.0
deleted file mode 100644
index 06fcef263b99..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=package to manage versions by scm tags via setuptools
-EAPI=5
-HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.10.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f1d4c3ed10305e2521b67fb3f371e700
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.10.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.10.1
deleted file mode 100644
index 38b836748894..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/mercurial ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=package to manage versions by scm tags via setuptools
-EAPI=5
-HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.10.1.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c8bda1a4cc3cd0505fc157469f666db8
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.11.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.11.1
deleted file mode 100644
index 2f357543c86b..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/mercurial ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=package to manage versions by scm tags via setuptools
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.11.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5742022bd8a2c42780747bcd3c89f34b
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.9.0 b/metadata/md5-cache/dev-python/setuptools_scm-1.9.0
deleted file mode 100644
index 687974e377f2..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=package to manage versions by scm tags via setuptools
-EAPI=5
-HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.9.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=877303ad7c7520d902322a35d9048140
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r8 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r8
deleted file mode 100644
index 760df83728f6..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python documentation generator
-EAPI=5
-HOMEPAGE=http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=<dev-python/docutils-0.13[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/pygments-1.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=72a09bcbfbe736e0adab77cdf122567a
diff --git a/metadata/md5-cache/dev-python/sphinx-1.5.1-r2 b/metadata/md5-cache/dev-python/sphinx-1.5.1-r2
deleted file mode 100644
index 50b3a38fb3bd..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.5.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx
-IUSE=doc latex net test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~hppa ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.5.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4ef0f907d6c07baba527021607eb3dfc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.0.15 b/metadata/md5-cache/dev-python/sqlalchemy-1.0.15
deleted file mode 100644
index 7066b2d9430b..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.0.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=6
-HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy
-IUSE=doc examples +sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.0.15.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6e857e8008d9c9acada3da6d9a8b555e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.1.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.1.4
deleted file mode 100644
index fa162fc5f2fd..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=6
-HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy
-IUSE=doc examples +sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.1.4.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d89870984af62d9ff3211a2d79719c1c
diff --git a/metadata/md5-cache/dev-python/subunit-1.1.0 b/metadata/md5-cache/dev-python/subunit-1.1.0
deleted file mode 100644
index f83acde1baaa..000000000000
--- a/metadata/md5-cache/dev-python/subunit-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl:= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-python/testscenarios[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A streaming protocol for test results
-EAPI=5
-HOMEPAGE=https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit
-IUSE=static-libs test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=Apache-2.0 BSD
-RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl:= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://launchpad.net/subunit/trunk/1.1.0/+download/subunit-1.1.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3d180790c8d4024c9fdf2d886935b628
diff --git a/metadata/md5-cache/dev-python/testtools-1.8.1 b/metadata/md5-cache/dev-python/testtools-1.8.1
deleted file mode 100644
index dcead13db6c0..000000000000
--- a/metadata/md5-cache/dev-python/testtools-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Extensions to the Python standard library unit testing framework
-EAPI=5
-HOMEPAGE=https://github.com/testing-cabal/testtools
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/testtools/testtools-1.8.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b965b67dff608394a73b50b78194347f
diff --git a/metadata/md5-cache/dev-python/testtools-1.9.0 b/metadata/md5-cache/dev-python/testtools-1.9.0
deleted file mode 100644
index afffb2b14c14..000000000000
--- a/metadata/md5-cache/dev-python/testtools-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/testscenarios[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/fixtures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Extensions to the Python standard library unit testing framework
-EAPI=5
-HOMEPAGE=https://github.com/testing-cabal/testtools
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/testtools/testtools-1.9.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2aef87ab90ca826c83907875f0024601
diff --git a/metadata/md5-cache/dev-python/testtools-2.0.0 b/metadata/md5-cache/dev-python/testtools-2.0.0
deleted file mode 100644
index 493dce5bb4cf..000000000000
--- a/metadata/md5-cache/dev-python/testtools-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/fixtures-1.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testscenarios[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Extensions to the Python standard library unit testing framework
-EAPI=5
-HOMEPAGE=https://github.com/testing-cabal/testtools
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/testtools/testtools-2.0.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c75202edf91d484dd901a1fa80df6e75
diff --git a/metadata/md5-cache/dev-python/twisted-16.2.0 b/metadata/md5-cache/dev-python/twisted-16.2.0
deleted file mode 100644
index f834b4088d9c..000000000000
--- a/metadata/md5-cache/dev-python/twisted-16.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=conch crypt serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] conch? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) crypt? ( >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) !dev-python/twisted-conch !dev-python/twisted-core !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-web !dev-python/twisted-words python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Twisted/16.2/Twisted-16.2.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4df851a2effd12ebdf19aa638c109147
diff --git a/metadata/md5-cache/dev-python/twisted-16.3.2 b/metadata/md5-cache/dev-python/twisted-16.3.2
deleted file mode 100644
index ec4e102d2a6b..000000000000
--- a/metadata/md5-cache/dev-python/twisted-16.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] conch? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) crypt? ( >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/hyper-h2-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Twisted/16.3/Twisted-16.3.2.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d231390a6498e007c05c0a5064cce836
diff --git a/metadata/md5-cache/dev-python/twisted-16.4.1 b/metadata/md5-cache/dev-python/twisted-16.4.1
deleted file mode 100644
index 9c8b9bacbab5..000000000000
--- a/metadata/md5-cache/dev-python/twisted-16.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-4.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] conch? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !dev-python/twisted-conch !dev-python/twisted-core !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-web !dev-python/twisted-words python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Twisted/16.4/Twisted-16.4.1.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=00b297962c1586ef2f699e729b052caf
diff --git a/metadata/md5-cache/dev-python/twisted-conch-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-conch-13.0.0-r1
deleted file mode 100644
index bb1c86e643bd..000000000000
--- a/metadata/md5-cache/dev-python/twisted-conch-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted SSHv2 implementation
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Conch/13.0/TwistedConch-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e116b7eb53591618a4616314ba3dfd3c
diff --git a/metadata/md5-cache/dev-python/twisted-conch-15.1.0 b/metadata/md5-cache/dev-python/twisted-conch-15.1.0
deleted file mode 100644
index 5cdb24176bf4..000000000000
--- a/metadata/md5-cache/dev-python/twisted-conch-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted SSHv2 implementation
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Conch/15.1/TwistedConch-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=952db15944a3c331072c20d31357bf57
diff --git a/metadata/md5-cache/dev-python/twisted-core-13.0.0-r3 b/metadata/md5-cache/dev-python/twisted-core-13.0.0-r3
deleted file mode 100644
index 068739e00f2f..000000000000
--- a/metadata/md5-cache/dev-python/twisted-core-13.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=crypt gtk serial python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Core/13.0/TwistedCore-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e566d777c55cf2bdbb04895388aaf136
diff --git a/metadata/md5-cache/dev-python/twisted-core-15.1.0 b/metadata/md5-cache/dev-python/twisted-core-15.1.0
deleted file mode 100644
index 212cdfa65d39..000000000000
--- a/metadata/md5-cache/dev-python/twisted-core-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=test? ( >=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=crypt gtk serial test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Core/15.1/TwistedCore-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e5488b435128820c4610ec2a800b8dbf
diff --git a/metadata/md5-cache/dev-python/twisted-lore-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-lore-13.0.0-r1
deleted file mode 100644
index 64f90ab998fb..000000000000
--- a/metadata/md5-cache/dev-python/twisted-lore-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted documentation system
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Lore/13.0/TwistedLore-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=717b7f550a8994f5b103003813a9596b
diff --git a/metadata/md5-cache/dev-python/twisted-lore-15.1.0 b/metadata/md5-cache/dev-python/twisted-lore-15.1.0
deleted file mode 100644
index 26a1ebdddd51..000000000000
--- a/metadata/md5-cache/dev-python/twisted-lore-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted documentation system
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Lore/15.1/TwistedLore-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a562b60ad62d7624aa2ecef24d3e4b7d
diff --git a/metadata/md5-cache/dev-python/twisted-mail-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-mail-13.0.0-r1
deleted file mode 100644
index fd9bac64484d..000000000000
--- a/metadata/md5-cache/dev-python/twisted-mail-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Twisted Mail library, server and client
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Mail/13.0/TwistedMail-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3528c14356d151d77722d981f7b0ca20
diff --git a/metadata/md5-cache/dev-python/twisted-mail-15.1.0 b/metadata/md5-cache/dev-python/twisted-mail-15.1.0
deleted file mode 100644
index c03c2dcc93f3..000000000000
--- a/metadata/md5-cache/dev-python/twisted-mail-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Twisted Mail library, server and client
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Mail/15.1/TwistedMail-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0b843d516f39039b46a463c1fcc2f8a3
diff --git a/metadata/md5-cache/dev-python/twisted-names-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-names-13.0.0-r1
deleted file mode 100644
index d3a8c99bb0ec..000000000000
--- a/metadata/md5-cache/dev-python/twisted-names-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Twisted DNS implementation
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Names/13.0/TwistedNames-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=96629c78f1b6137402f1a7378f43b00c
diff --git a/metadata/md5-cache/dev-python/twisted-names-15.1.0 b/metadata/md5-cache/dev-python/twisted-names-15.1.0
deleted file mode 100644
index 3b13d89a82c5..000000000000
--- a/metadata/md5-cache/dev-python/twisted-names-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Twisted DNS implementation
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Names/15.1/TwistedNames-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=48867ae225072881f4b66a57622c51ce
diff --git a/metadata/md5-cache/dev-python/twisted-news-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-news-13.0.0-r1
deleted file mode 100644
index 826f82560524..000000000000
--- a/metadata/md5-cache/dev-python/twisted-news-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted News is an NNTP server and programming library
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/News/13.0/TwistedNews-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=859101ac7a3acdbc1bbdeca1e0d1aa7b
diff --git a/metadata/md5-cache/dev-python/twisted-news-15.1.0 b/metadata/md5-cache/dev-python/twisted-news-15.1.0
deleted file mode 100644
index 13b9482a2d95..000000000000
--- a/metadata/md5-cache/dev-python/twisted-news-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted News is an NNTP server and programming library
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/News/15.1/TwistedNews-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b46cf3abcaf14f5a96accb4d5f58cd69
diff --git a/metadata/md5-cache/dev-python/twisted-pair-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-pair-13.0.0-r1
deleted file mode 100644
index 2f16509d8041..000000000000
--- a/metadata/md5-cache/dev-python/twisted-pair-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted low-level networking
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Pair/13.0/TwistedPair-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4d5b1e131caac692c35c31ada1bcd0a6
diff --git a/metadata/md5-cache/dev-python/twisted-pair-15.1.0 b/metadata/md5-cache/dev-python/twisted-pair-15.1.0
deleted file mode 100644
index 01b4f32612b4..000000000000
--- a/metadata/md5-cache/dev-python/twisted-pair-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted low-level networking
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Pair/15.1/TwistedPair-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=fa37fcc1fd4e2164e2169697af95a795
diff --git a/metadata/md5-cache/dev-python/twisted-runner-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-runner-13.0.0-r1
deleted file mode 100644
index 76b96d969e05..000000000000
--- a/metadata/md5-cache/dev-python/twisted-runner-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted Runner is a process management library and inetd replacement
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Runner/13.0/TwistedRunner-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8657ca5bbee872dc87f8d3172ca93064
diff --git a/metadata/md5-cache/dev-python/twisted-runner-15.1.0 b/metadata/md5-cache/dev-python/twisted-runner-15.1.0
deleted file mode 100644
index 3ae1052c54e4..000000000000
--- a/metadata/md5-cache/dev-python/twisted-runner-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted Runner is a process management library and inetd replacement
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Runner/15.1/TwistedRunner-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b6959ec409fccb4e7ce7dfc56d114ea9
diff --git a/metadata/md5-cache/dev-python/twisted-web-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-web-13.0.0-r1
deleted file mode 100644
index 0e4da65b186e..000000000000
--- a/metadata/md5-cache/dev-python/twisted-web-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted web server, programmable in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=soap python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Web/13.0/TwistedWeb-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0db985b6efbf7c2b1e6f64a38247fd09
diff --git a/metadata/md5-cache/dev-python/twisted-web-15.1.0 b/metadata/md5-cache/dev-python/twisted-web-15.1.0
deleted file mode 100644
index d6578d932c47..000000000000
--- a/metadata/md5-cache/dev-python/twisted-web-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted web server, programmable in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=soap python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Web/15.1/TwistedWeb-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b0a5bb12e0800bed5eb1a5bb458ea4e2
diff --git a/metadata/md5-cache/dev-python/twisted-words-13.0.0-r1 b/metadata/md5-cache/dev-python/twisted-words-13.0.0-r1
deleted file mode 100644
index bade65fa8a5d..000000000000
--- a/metadata/md5-cache/dev-python/twisted-words-13.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted Words contains Instant Messaging implementations
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Words/13.0/TwistedWords-13.0.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=92b8dda3e04905806a8adac2c38d8124
diff --git a/metadata/md5-cache/dev-python/twisted-words-15.1.0 b/metadata/md5-cache/dev-python/twisted-words-15.1.0
deleted file mode 100644
index 3c9b88b92d37..000000000000
--- a/metadata/md5-cache/dev-python/twisted-words-15.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted Words contains Instant Messaging implementations
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/Words/15.1/TwistedWords-15.1.0.tar.bz2
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8ec2651ae27111c23b9bec54501bd152
diff --git a/metadata/md5-cache/dev-python/unittest2-1.0.1-r1 b/metadata/md5-cache/dev-python/unittest2-1.0.1-r1
deleted file mode 100644
index 4f745231332d..000000000000
--- a/metadata/md5-cache/dev-python/unittest2-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The new features in unittest for Python 2.7 backported to Python 2.4+
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/unittest2
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/u/unittest2/unittest2-1.0.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=fd99e48d2f99a195d1242bb3e11c9e86
diff --git a/metadata/md5-cache/dev-python/urllib3-1.19.1 b/metadata/md5-cache/dev-python/urllib3-1.19.1
deleted file mode 100644
index 6f6db036002f..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/certifi[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-1.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-1.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-exclude-0.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=6
-HOMEPAGE=https://github.com/shazow/urllib3
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/certifi[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.19.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3c4496b61c29425d90ee39974fafc53f
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.0.1 b/metadata/md5-cache/dev-python/verboselogs-1.0.1
deleted file mode 100644
index ee98bc37aa41..000000000000
--- a/metadata/md5-cache/dev-python/verboselogs-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Verbose logging for Python's logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/verboselogs
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.0.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a925dd556123d415eee648b1245b720f
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.0.2 b/metadata/md5-cache/dev-python/verboselogs-1.0.2
deleted file mode 100644
index d96fdeaf4ae1..000000000000
--- a/metadata/md5-cache/dev-python/verboselogs-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Verbose logging for Python's logging module
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/verboselogs
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.0.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a925dd556123d415eee648b1245b720f
diff --git a/metadata/md5-cache/dev-python/versioneer-0.15 b/metadata/md5-cache/dev-python/versioneer-0.15
deleted file mode 100644
index 782603c6c7c6..000000000000
--- a/metadata/md5-cache/dev-python/versioneer-0.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Easy VCS-based management of project version strings
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=public-domain
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/v/versioneer/versioneer-0.15.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9d5727f0c47b89839341fd51687426dc
diff --git a/metadata/md5-cache/dev-python/virtualenv-13.1.2 b/metadata/md5-cache/dev-python/virtualenv-13.1.2
deleted file mode 100644
index 7507fd26a362..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-13.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Virtual Python Environment builder
-EAPI=5
-HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pypa/virtualenv/archive/13.1.2.tar.gz -> virtualenv-13.1.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3ae7e34ca713fc8e347f219fe15c5199
diff --git a/metadata/md5-cache/dev-python/virtualenv-13.1.2-r1 b/metadata/md5-cache/dev-python/virtualenv-13.1.2-r1
deleted file mode 100644
index f7bf308d15d5..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-13.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Virtual Python Environment builder
-EAPI=5
-HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pypa/virtualenv/archive/13.1.2.tar.gz -> virtualenv-13.1.2.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ea81beb67f8658b5bf5bf9e717b0caf7
diff --git a/metadata/md5-cache/dev-python/virtualenv-14.0.6 b/metadata/md5-cache/dev-python/virtualenv-14.0.6
deleted file mode 100644
index faeba149e9ce..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-14.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Virtual Python Environment builder
-EAPI=6
-HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pypa/virtualenv/archive/14.0.6.tar.gz -> virtualenv-14.0.6.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=713f3349ca0abb6939a3bd1bcc6b9d20
diff --git a/metadata/md5-cache/dev-python/virtualenv-15.0.3 b/metadata/md5-cache/dev-python/virtualenv-15.0.3
deleted file mode 100644
index f57d70adf367..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-15.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-19.6.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Virtual Python Environment builder
-EAPI=6
-HOMEPAGE=http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv https://github.com/pypa/virtualenv/
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pypa/virtualenv/archive/15.0.3.tar.gz -> virtualenv-15.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=58c6f5c54a73608b69c751917b51b3d5
diff --git a/metadata/md5-cache/dev-python/waitress-0.8.10-r2 b/metadata/md5-cache/dev-python/waitress-0.8.10-r2
deleted file mode 100644
index 291f7b474662..000000000000
--- a/metadata/md5-cache/dev-python/waitress-0.8.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A pure-Python WSGI server
-EAPI=5
-HOMEPAGE=http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/w/waitress/waitress-0.8.10.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=af4070d4f82a02a2fe28d2d9d3f8b1cd
diff --git a/metadata/md5-cache/dev-python/waitress-0.8.9 b/metadata/md5-cache/dev-python/waitress-0.8.9
deleted file mode 100644
index 8e72e54c0f5a..000000000000
--- a/metadata/md5-cache/dev-python/waitress-0.8.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A pure-Python WSGI server
-EAPI=5
-HOMEPAGE=http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/w/waitress/waitress-0.8.9.tar.gz doc? ( https://dev.gentoo.org/~idella4/pylons_sphinx_theme.tar.gz )
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4192b3a10ab45f48a108f77714d0683e
diff --git a/metadata/md5-cache/dev-python/webob-1.4.1 b/metadata/md5-cache/dev-python/webob-1.4.1
deleted file mode 100644
index d628f9d21318..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=WSGI request and response object
-EAPI=5
-HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.4.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a9a6e34f28e0e751361af1c53ff4f3c9
diff --git a/metadata/md5-cache/dev-python/webob-1.5.0 b/metadata/md5-cache/dev-python/webob-1.5.0
deleted file mode 100644
index a51416b8f0e3..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=WSGI request and response object
-EAPI=5
-HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.5.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=93f4d46afdeb172a1f8c500eca678afb
diff --git a/metadata/md5-cache/dev-python/webob-1.5.1 b/metadata/md5-cache/dev-python/webob-1.5.1
deleted file mode 100644
index f511e97fced4..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=WSGI request and response object
-EAPI=5
-HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.5.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ec725edd9790ea3b9ed478617223154b
diff --git a/metadata/md5-cache/dev-python/webob-1.6.0 b/metadata/md5-cache/dev-python/webob-1.6.0
deleted file mode 100644
index dcffb6d8ccaf..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=WSGI request and response object
-EAPI=6
-HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.6.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=25811841c50d7c7839a395b63ca99071
diff --git a/metadata/md5-cache/dev-python/webob-1.6.1 b/metadata/md5-cache/dev-python/webob-1.6.1
deleted file mode 100644
index 00f9f94c08ea..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=WSGI request and response object
-EAPI=6
-HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.6.1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7145ed3044612bb5954191b004ffd031
diff --git a/metadata/md5-cache/dev-python/webtest-1.4.3-r1 b/metadata/md5-cache/dev-python/webtest-1.4.3-r1
deleted file mode 100644
index 7ff3878f7e12..000000000000
--- a/metadata/md5-cache/dev-python/webtest-1.4.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/webob-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyquery[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Helper to test WSGI applications
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
-IUSE=doc test python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-python/webob-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebTest/WebTest-1.4.3.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9841f0035252e5d3443e72068544735e
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.17 b/metadata/md5-cache/dev-python/webtest-2.0.17
deleted file mode 100644
index a4edb07add07..000000000000
--- a/metadata/md5-cache/dev-python/webtest-2.0.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyquery[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/wsgiproxy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Helper to test WSGI applications
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
-IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.17.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=68754f07a0192f552da3742ce0e6dbf1
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.18 b/metadata/md5-cache/dev-python/webtest-2.0.18
deleted file mode 100644
index 3b9bf6ebba0c..000000000000
--- a/metadata/md5-cache/dev-python/webtest-2.0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyquery[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wsgiproxy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Helper to test WSGI applications
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.18.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e4b8865d949e486e5e1e5ad5ab7a6f01
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.3 b/metadata/md5-cache/dev-python/whoosh-2.7.3
deleted file mode 100644
index fd8bc06fa916..000000000000
--- a/metadata/md5-cache/dev-python/whoosh-2.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Fast, pure-Python full text indexing, search and spell checking library
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.7.3.zip
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=275e84635c3f475cca47e9331876636f
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.6-r1 b/metadata/md5-cache/dev-python/wrapt-1.10.6-r1
deleted file mode 100644
index dcd162c8eae2..000000000000
--- a/metadata/md5-cache/dev-python/wrapt-1.10.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Module for decorators, wrappers and monkey patching
-EAPI=5
-HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.6.tar.gz -> wrapt-1.10.6-r1.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2430f9bdae41739322e3cd51b8a72ff6
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.7 b/metadata/md5-cache/dev-python/wrapt-1.10.7
deleted file mode 100644
index 78b245659080..000000000000
--- a/metadata/md5-cache/dev-python/wrapt-1.10.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Module for decorators, wrappers and monkey patching
-EAPI=5
-HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.7.tar.gz -> wrapt-1.10.7.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=dc38814b6631f1487d697f7ba5f8f0b6
diff --git a/metadata/md5-cache/dev-python/wxpython-3.0.0.0 b/metadata/md5-cache/dev-python/wxpython-3.0.0.0
deleted file mode 100644
index 2b48493c766e..000000000000
--- a/metadata/md5-cache/dev-python/wxpython-3.0.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.0.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A blending of the wxWindows C++ class library with Python
-EAPI=5
-HOMEPAGE=http://www.wxpython.org/
-IUSE=cairo examples libnotify opengl python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=wxWinLL-3
-RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.0.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=3.0
-SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.0.0.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-3.0.0.0.tar.bz2 )
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=cbb919ac320f253918cceea2c08979b6
diff --git a/metadata/md5-cache/dev-python/wxpython-3.0.1.1 b/metadata/md5-cache/dev-python/wxpython-3.0.1.1
deleted file mode 100644
index 05d80a804a26..000000000000
--- a/metadata/md5-cache/dev-python/wxpython-3.0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.1.1:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A blending of the wxWindows C++ class library with Python
-EAPI=5
-HOMEPAGE=http://www.wxpython.org/
-IUSE=cairo examples libnotify opengl python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=wxWinLL-3
-RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.1.1:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=3.0
-SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.1.1.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-3.0.1.1.tar.bz2 )
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c4130d73a421b1739c17ff0c278bbd2b
diff --git a/metadata/md5-cache/dev-python/zope-event-4.0.3 b/metadata/md5-cache/dev-python/zope-event-4.0.3
deleted file mode 100644
index 206341c7c862..000000000000
--- a/metadata/md5-cache/dev-python/zope-event-4.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
-EAPI=5
-HOMEPAGE=https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ZPL
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.event/zope.event-4.0.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=717b4571d1a87279dbf0fefa39974b21
diff --git a/metadata/md5-cache/dev-python/zope-event-4.1.0 b/metadata/md5-cache/dev-python/zope-event-4.1.0
deleted file mode 100644
index 353d2592adfc..000000000000
--- a/metadata/md5-cache/dev-python/zope-event-4.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
-EAPI=5
-HOMEPAGE=https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ZPL
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.event/zope.event-4.1.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c49d8aabf36428413366e3b9e76ec5e9
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.1.3 b/metadata/md5-cache/dev-python/zope-interface-4.1.3
deleted file mode 100644
index 3febc8a5302e..000000000000
--- a/metadata/md5-cache/dev-python/zope-interface-4.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Interfaces for Python
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ZPL
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.1.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d00f5080a7ce6728ff05074dc5af488d
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.2.0 b/metadata/md5-cache/dev-python/zope-interface-4.2.0
deleted file mode 100644
index e25d30b8fd78..000000000000
--- a/metadata/md5-cache/dev-python/zope-interface-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/zope-event[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Interfaces for Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ZPL
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.2.0.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9111331fa904786838e780152b503727
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.3.3 b/metadata/md5-cache/dev-python/zope-interface-4.3.3
deleted file mode 100644
index 426d62df4970..000000000000
--- a/metadata/md5-cache/dev-python/zope-interface-4.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-33.1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/zope-event[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Interfaces for Python
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ZPL
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.3.3.tar.gz
-_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3653799d53a806009ac797736fa14750
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.0 b/metadata/md5-cache/dev-ruby/erubi-1.6.0
new file mode 100644
index 000000000000..86f916177408
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/erubi-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
+EAPI=6
+HOMEPAGE=https://github.com/jeremyevans/erubi
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/erubi-1.6.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=068ec4191e5672a6bb7a264e63f999fe
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.1.2 b/metadata/md5-cache/dev-ruby/gherkin-4.1.2
new file mode 100644
index 000000000000..b83ae9c9bc0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/gherkin
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=4
+SRC_URI=mirror://rubygems/gherkin-4.1.2.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5810c64c477b8efeb22dd3df4a814923
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0 b/metadata/md5-cache/dev-ruby/gruff-0.7.0
index 0f46d1a41e66..1cb16073e1e4 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/test-unit[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Beautiful graphs for one or multiple datasets
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/gruff
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby20? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.7.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=531828ac3aa235d700ece1a2aacc7bf6
+_md5_=873b90fe10778aa62ddb554efd4204e4
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.0.0 b/metadata/md5-cache/dev-ruby/html2haml-2.0.0
deleted file mode 100644
index 4fcde143bbd1..000000000000
--- a/metadata/md5-cache/dev-ruby/html2haml-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby20] >=dev-ruby/haml-4.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Convert HTML and HTML+Erb to Haml
-EAPI=5
-HOMEPAGE=https://github.com/haml/html2haml
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby20] >=dev-ruby/haml-4.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/html2haml-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e01474b8b7448eb01b4e0c117c0e30ef
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
new file mode 100644
index 000000000000..3b28a898d8b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] <dev-ruby/haml-6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Convert HTML and HTML+Erb to Haml
+EAPI=6
+HOMEPAGE=https://github.com/haml/html2haml
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] <dev-ruby/haml-6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/html2haml-2.2.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=24cfe7b244d099c78a3d8cd456fde76d
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.16.0 b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
new file mode 100644
index 000000000000..a4e0fabf3176
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=media-gfx/imagemagick-6.4.9:=[jpeg] ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
+EAPI=6
+HOMEPAGE=https://github.com/gemhome/rmagick
+IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos
+LICENSE=Artistic
+RDEPEND=>=media-gfx/imagemagick-6.4.9:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/rmagick-2.16.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=82d910b89dbcb9daea7a26d591ae231b
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
deleted file mode 100644
index 4f1b99f10a2d..000000000000
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-arch/zip ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A ruby library for reading and writing zip files
-EAPI=5
-HOMEPAGE=https://github.com/aussiegeek/rubyzip
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=938a5b7b3f71eca348907a60796aaba8
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.3 b/metadata/md5-cache/dev-ruby/slop-4.4.3
new file mode 100644
index 000000000000..9131e8babf14
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/slop-4.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
+EAPI=6
+HOMEPAGE=https://github.com/injekt/slop
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=4
+SRC_URI=https://github.com/injekt/slop/archive/v4.4.3.tar.gz -> slop-4.4.3.tgz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 2db9a9366484..4183a2ae6434 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby20] dev-ruby/dust[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby21] dev-ruby/dust[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby21] dev-ruby/dust[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby23] dev-ruby/dust[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Create sparklines, small graphs to be used inline in texts
 EAPI=5
 HOMEPAGE=http://sparklines.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=dev-ruby/rmagick ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-ruby/rmagick ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=635567906c507654904c1a858c6c489b
+_md5_=5f76d380bc220b892a04331d72b9ae7c
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
index 5e37482f0468..b9d8ce0ddaa2 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=4
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=java elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2017-02-05.tar.xz
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	latex-package	00777e2de6c20be92a1adce060eeafa4	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a91ce2adba0d138a95f994dcc9ed8385
+_md5_=3da0bc3062e317eb641b92aa3a476c76
diff --git a/metadata/md5-cache/dev-util/cmake-3.8.0 b/metadata/md5-cache/dev-util/cmake-3.8.1
similarity index 57%
rename from metadata/md5-cache/dev-util/cmake-3.8.0
rename to metadata/md5-cache/dev-util/cmake-3.8.1
index a3bd2e44f7b6..3afe5e576cb0 100644
--- a/metadata/md5-cache/dev-util/cmake-3.8.0
+++ b/metadata/md5-cache/dev-util/cmake-3.8.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=http://www.cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt5 test
+IUSE=doc emacs server system-jsoncpp ncurses qt5 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
-SRC_URI=http://www.cmake.org/files/v3.8/cmake-3.8.0.tar.gz
+SRC_URI=http://www.cmake.org/files/v3.8/cmake-3.8.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	a69f3a404abc4ade0a99e523f51b989d	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=f9cae215634715a7a00fa128065dc5f9
+_md5_=624fb9f78c6d701b17eab076967a53b0
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1 b/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
index 0b44d8add49d..66849b97b747 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-util/kdevplatform:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-util/kdevplatform:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Python plugin for KDevelop
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
-IUSE=debug python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+IUSE=debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-util/kdevplatform:5 dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-util/kdevelop:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-util/kdevplatform:5 dev-python/pycodestyle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-util/kdevelop:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.0/src/kdev-python-5.1.0.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	a3440b0ee8a6548644b07f0936a4acda	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d9e896a457632c710444ce235392bca7
+_md5_=3b5a0e149cbfdfadd0b29750dcb65233
diff --git a/metadata/md5-cache/games-strategy/widelands-0.17 b/metadata/md5-cache/games-strategy/widelands-0.17
deleted file mode 100644
index a372576d507b..000000000000
--- a/metadata/md5-cache/games-strategy/widelands-0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/libpng:0 sys-libs/zlib media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.37 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A game similar to Settlers 2
-EAPI=5
-HOMEPAGE=http://www.widelands.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/libpng:0 sys-libs/zlib media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.37 games-misc/games-envd
-SLOT=0
-SRC_URI=https://launchpad.net/widelands/build17/build-17/+download/widelands-build17-src.tar.bz2
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ee2ed99fe9c6fea6d691e38b111ae86e
diff --git a/metadata/md5-cache/games-strategy/widelands-0.18 b/metadata/md5-cache/games-strategy/widelands-0.18
deleted file mode 100644
index 9722d8ac8c14..000000000000
--- a/metadata/md5-cache/games-strategy/widelands-0.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/libpng:0 sys-libs/zlib[minizip] media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.48 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A game similar to Settlers 2
-EAPI=5
-HOMEPAGE=http://www.widelands.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/libpng:0 sys-libs/zlib[minizip] media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.48 games-misc/games-envd
-SLOT=0
-SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.tar.bz2
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1777335c52aaacc94d111b80f1691a94
diff --git a/metadata/md5-cache/games-strategy/widelands-0.18-r1 b/metadata/md5-cache/games-strategy/widelands-0.18-r1
index 44aba928e977..af2d170c1016 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.18-r1
+++ b/metadata/md5-cache/games-strategy/widelands-0.18-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48 media-libs/glew media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip] sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip] sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A game similar to Settlers 2
 EAPI=6
 HOMEPAGE=http://www.widelands.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
-RDEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48 media-libs/glew media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip]
+RDEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.tar.bz2
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1910945942f166bf21c990bbdd417ad4
+_md5_=791444c19d36f35d80ddb39f07f8d6ec
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2
index b49afad9e284..a24435c0397e 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d8a6f27c68d393d9e7bd44a7962b4c89
+_md5_=ccc6bc514269204945e34e30481f8127
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8 b/metadata/md5-cache/gnustep-base/libobjc2-1.8
index eae93da56d98..c8c6362500ab 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8
@@ -10,4 +10,4 @@ RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.tar.gz -> libobjc2-1.8.tar.gz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=aa8b4692755a694a0dd41bfeaba467b4
+_md5_=4db124e014214e74eb9feafeb20cc8ae
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1 b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
index a14194e75b82..7f89a780b82b 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
@@ -10,4 +10,4 @@ RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.1.tar.gz -> libobjc2-1.8.1.tar.gz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=aa8b4692755a694a0dd41bfeaba467b4
+_md5_=4db124e014214e74eb9feafeb20cc8ae
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.7.0 b/metadata/md5-cache/mail-client/thunderbird-45.7.0
deleted file mode 100644
index d036464d0c89..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-45.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened ldap lightning +minimal mozdom selinux custom-cflags custom-optimization dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx +jit l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=system-harfbuzz? ( system-icu )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ar.xpi -> thunderbird-45.7.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ast.xpi -> thunderbird-45.7.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/be.xpi -> thunderbird-45.7.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/bg.xpi -> thunderbird-45.7.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.7.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/br.xpi -> thunderbird-45.7.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ca.xpi -> thunderbird-45.7.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/cs.xpi -> thunderbird-45.7.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/cy.xpi -> thunderbird-45.7.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/da.xpi -> thunderbird-45.7.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/de.xpi -> thunderbird-45.7.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/el.xpi -> thunderbird-45.7.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.7.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/et.xpi -> thunderbird-45.7.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/eu.xpi -> thunderbird-45.7.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/fi.xpi -> thunderbird-45.7.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/fr.xpi -> thunderbird-45.7.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.7.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.7.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/gd.xpi -> thunderbird-45.7.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/gl.xpi -> thunderbird-45.7.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/he.xpi -> thunderbird-45.7.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/hr.xpi -> thunderbird-45.7.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.7.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/hu.xpi -> thunderbird-45.7.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.7.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/id.xpi -> thunderbird-45.7.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/is.xpi -> thunderbird-45.7.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/it.xpi -> thunderbird-45.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ja.xpi -> thunderbird-45.7.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ko.xpi -> thunderbird-45.7.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/lt.xpi -> thunderbird-45.7.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.7.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/nl.xpi -> thunderbird-45.7.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.7.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.7.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/pl.xpi -> thunderbird-45.7.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.7.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.7.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/rm.xpi -> thunderbird-45.7.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ro.xpi -> thunderbird-45.7.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ru.xpi -> thunderbird-45.7.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/si.xpi -> thunderbird-45.7.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/sk.xpi -> thunderbird-45.7.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/sl.xpi -> thunderbird-45.7.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/sq.xpi -> thunderbird-45.7.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/sr.xpi -> thunderbird-45.7.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.7.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.7.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/tr.xpi -> thunderbird-45.7.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/uk.xpi -> thunderbird-45.7.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/vi.xpi -> thunderbird-45.7.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.7.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.7.0/source/thunderbird-45.7.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.7.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) crypt? ( http://www.enigmail.net/download/source/enigmail-1.9.1.tar.gz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-11.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.45	99c4da6b8841edb07702b7c238af0f63	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=20c7d9dc2c241cf1033306f046d050dc
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.8.0 b/metadata/md5-cache/mail-client/thunderbird-45.8.0
index 82d8107b0c3c..f157a6b5fc1a 100644
--- a/metadata/md5-cache/mail-client/thunderbird-45.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-45.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Thunderbird Mail Client
 EAPI=6
 HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
 IUSE=bindist crypt hardened ldap lightning +minimal mozdom selinux custom-cflags custom-optimization dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx +jit l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 crypt? ( x11-plugins/enigmail[-thunderbird(-)] ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=system-harfbuzz? ( system-icu )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ar.xpi -> thunderbird-45.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ast.xpi -> thunderbird-45.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/be.xpi -> thunderbird-45.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bg.xpi -> thunderbird-45.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/br.xpi -> thunderbird-45.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ca.xpi -> thunderbird-45.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cs.xpi -> thunderbird-45.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cy.xpi -> thunderbird-45.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/da.xpi -> thunderbird-45.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/de.xpi -> thunderbird-45.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/el.xpi -> thunderbird-45.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/et.xpi -> thunderbird-45.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/eu.xpi -> thunderbird-45.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fi.xpi -> thunderbird-45.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fr.xpi -> thunderbird-45.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gd.xpi -> thunderbird-45.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gl.xpi -> thunderbird-45.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/he.xpi -> thunderbird-45.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hr.xpi -> thunderbird-45.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hu.xpi -> thunderbird-45.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/id.xpi -> thunderbird-45.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/is.xpi -> thunderbird-45.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/it.xpi -> thunderbird-45.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ja.xpi -> thunderbird-45.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ko.xpi -> thunderbird-45.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/lt.xpi -> thunderbird-45.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nl.xpi -> thunderbird-45.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pl.xpi -> thunderbird-45.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/rm.xpi -> thunderbird-45.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ro.xpi -> thunderbird-45.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ru.xpi -> thunderbird-45.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/si.xpi -> thunderbird-45.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sk.xpi -> thunderbird-45.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sl.xpi -> thunderbird-45.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sq.xpi -> thunderbird-45.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sr.xpi -> thunderbird-45.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/tr.xpi -> thunderbird-45.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/uk.xpi -> thunderbird-45.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/vi.xpi -> thunderbird-45.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/source/thunderbird-45.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.8.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-12.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.45	99c4da6b8841edb07702b7c238af0f63	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=291a65ae8df46af00b7d5bf7798d9f58
+_md5_=48daefd018b522ea4f6e2ab9bdb55b0f
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.1.0 b/metadata/md5-cache/mail-client/thunderbird-52.1.0
new file mode 100644
index 000000000000..a783430e937b
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-52.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
+IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 crypt? ( x11-plugins/enigmail[-thunderbird(-)] ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ar.xpi -> thunderbird-52.1.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ast.xpi -> thunderbird-52.1.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/be.xpi -> thunderbird-52.1.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/bg.xpi -> thunderbird-52.1.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.1.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/br.xpi -> thunderbird-52.1.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ca.xpi -> thunderbird-52.1.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/cs.xpi -> thunderbird-52.1.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/cy.xpi -> thunderbird-52.1.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/da.xpi -> thunderbird-52.1.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/de.xpi -> thunderbird-52.1.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/el.xpi -> thunderbird-52.1.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.1.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.1.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.1.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/et.xpi -> thunderbird-52.1.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/eu.xpi -> thunderbird-52.1.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fi.xpi -> thunderbird-52.1.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fr.xpi -> thunderbird-52.1.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.1.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.1.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/gd.xpi -> thunderbird-52.1.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/gl.xpi -> thunderbird-52.1.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/he.xpi -> thunderbird-52.1.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hr.xpi -> thunderbird-52.1.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.1.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hu.xpi -> thunderbird-52.1.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.1.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/id.xpi -> thunderbird-52.1.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/is.xpi -> thunderbird-52.1.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/it.xpi -> thunderbird-52.1.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ja.xpi -> thunderbird-52.1.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ko.xpi -> thunderbird-52.1.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/lt.xpi -> thunderbird-52.1.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.1.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nl.xpi -> thunderbird-52.1.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.1.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.1.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pl.xpi -> thunderbird-52.1.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.1.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.1.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/rm.xpi -> thunderbird-52.1.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ro.xpi -> thunderbird-52.1.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ru.xpi -> thunderbird-52.1.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/si.xpi -> thunderbird-52.1.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sk.xpi -> thunderbird-52.1.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sl.xpi -> thunderbird-52.1.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sq.xpi -> thunderbird-52.1.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sr.xpi -> thunderbird-52.1.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.1.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.1.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/tr.xpi -> thunderbird-52.1.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/uk.xpi -> thunderbird-52.1.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/vi.xpi -> thunderbird-52.1.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.1.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.1.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/source/thunderbird-52.1.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.1.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.0-patches-08.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.0-patches-08.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.0-patches-08.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	makeedit	5b9d1905404073cf12f3bf4d694cf387	mozconfig-v6.52	3ff88dbdfb74ed3f13df0938d67546e7	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=84b8d22553c722799b98ec82f639960e
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.1.0 b/metadata/md5-cache/mail-client/thunderbird-bin-52.1.0
new file mode 100644
index 000000000000..a9fd521c930b
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/thunderbird
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ar.xpi -> thunderbird-52.1.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ast.xpi -> thunderbird-52.1.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/be.xpi -> thunderbird-52.1.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/bg.xpi -> thunderbird-52.1.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.1.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/br.xpi -> thunderbird-52.1.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ca.xpi -> thunderbird-52.1.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/cs.xpi -> thunderbird-52.1.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/cy.xpi -> thunderbird-52.1.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/da.xpi -> thunderbird-52.1.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/de.xpi -> thunderbird-52.1.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/el.xpi -> thunderbird-52.1.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.1.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.1.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.1.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/et.xpi -> thunderbird-52.1.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/eu.xpi -> thunderbird-52.1.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fi.xpi -> thunderbird-52.1.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fr.xpi -> thunderbird-52.1.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.1.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.1.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/gd.xpi -> thunderbird-52.1.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/gl.xpi -> thunderbird-52.1.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/he.xpi -> thunderbird-52.1.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hr.xpi -> thunderbird-52.1.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.1.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hu.xpi -> thunderbird-52.1.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.1.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/id.xpi -> thunderbird-52.1.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/is.xpi -> thunderbird-52.1.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/it.xpi -> thunderbird-52.1.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ja.xpi -> thunderbird-52.1.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ko.xpi -> thunderbird-52.1.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/lt.xpi -> thunderbird-52.1.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.1.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nl.xpi -> thunderbird-52.1.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.1.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.1.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pl.xpi -> thunderbird-52.1.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.1.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.1.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/rm.xpi -> thunderbird-52.1.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ro.xpi -> thunderbird-52.1.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ru.xpi -> thunderbird-52.1.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/si.xpi -> thunderbird-52.1.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sk.xpi -> thunderbird-52.1.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sl.xpi -> thunderbird-52.1.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sq.xpi -> thunderbird-52.1.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sr.xpi -> thunderbird-52.1.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.1.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.1.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/tr.xpi -> thunderbird-52.1.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/uk.xpi -> thunderbird-52.1.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/vi.xpi -> thunderbird-52.1.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.1.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.1.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/en-US/thunderbird-52.1.0.tar.bz2 -> thunderbird-bin_x86_64-52.1.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/en-US/thunderbird-52.1.0.tar.bz2 -> thunderbird-bin_i686-52.1.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.1.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=296daa0c5717317a94d739d23b7b65d5
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3_pre20170218 b/metadata/md5-cache/mail-mta/postfix-3.3_pre20170502
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.3_pre20170218
rename to metadata/md5-cache/mail-mta/postfix-3.3_pre20170502
index eb07c3e83461..bf1757a050e6 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.3_pre20170218
+++ b/metadata/md5-cache/mail-mta/postfix-3.3_pre20170502
@@ -9,6 +9,6 @@ LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20170218.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20170502.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
 _md5_=0a6a0f7506ad73c18d74edb4d138f55f
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r1 b/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r1
new file mode 100644
index 000000000000..06f0175e7661
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170317
+DESCRIPTION=An OpenType text shaping engine
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.6.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=39e405a6b1d4b9ff2708f29d66e15433
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index ad2d963e33e9..4f141962286e 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -3,10 +3,10 @@ DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x
 DESCRIPTION=An OpenType text shaping engine
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7673e4757a5d7865cd27be0de24433cc
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=96806e771176fa0f270117e757e9e803
diff --git a/metadata/md5-cache/media-libs/virglrenderer-0.5.0 b/metadata/md5-cache/media-libs/virglrenderer-0.6.0
similarity index 92%
rename from metadata/md5-cache/media-libs/virglrenderer-0.5.0
rename to metadata/md5-cache/media-libs/virglrenderer-0.6.0
index 7ab4b17d6f21..5919167a5770 100644
--- a/metadata/md5-cache/media-libs/virglrenderer-0.5.0
+++ b/metadata/md5-cache/media-libs/virglrenderer-0.6.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy sys-devel/autoconf-archive >=x11-misc/util-macros-1.8 test? ( >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=library used implement a virtual 3D GPU used by qemu
-EAPI=5
+EAPI=6
 HOMEPAGE=https://virgil3d.github.io/
 IUSE=static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/virglrenderer-0.5.0.tar.xz
+SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/virglrenderer-0.6.0.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=89dc2b5296d9f56c38050fd4a0a584b6
+_md5_=6907095d3db1c7c2b3adbdbbfd8d1814
diff --git a/metadata/md5-cache/media-libs/virglrenderer-9999 b/metadata/md5-cache/media-libs/virglrenderer-9999
index 41931ac64475..1032d0052b8a 100644
--- a/metadata/md5-cache/media-libs/virglrenderer-9999
+++ b/metadata/md5-cache/media-libs/virglrenderer-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy sys-devel/autoconf-archive >=x11-misc/util-macros-1.8 test? ( >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy sys-devel/autoconf-archive >=x11-misc/util-macros-1.8 test? ( >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=library used implement a virtual 3D GPU used by qemu
-EAPI=5
+EAPI=6
 HOMEPAGE=https://virgil3d.github.io/
 IUSE=static-libs test
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy
 SLOT=0
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	git-2	195a672bfaf52d868442171c9469bbb6	libtool	e32ea84bf82cf8987965b574672dba93	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f5a35f5222b060a6e3905b083420d7e2
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=3cba399e97406c983824b60b7788dad4
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
deleted file mode 100644
index 24c0456247f6..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.49.tar.gz
-_md5_=be01f58ac638159e01c70dc51716dffd
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.54
similarity index 68%
rename from metadata/md5-cache/net-libs/libmicrohttpd-0.9.47
rename to metadata/md5-cache/net-libs/libmicrohttpd-0.9.54
index a6bbd55b045a..b73c9c3dbf86 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.54
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install test
 DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
 DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.47.tar.gz
-_md5_=9be3e9d236f5883cabb6c064d7dc2158
+SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.54.tar.gz
+_md5_=7c90e1ff5cb1040962fb674b7d552ef1
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r4 b/metadata/md5-cache/net-libs/openslp-2.0.0-r4
index 76d1286a87eb..687cf6e340df 100644
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r4
+++ b/metadata/md5-cache/net-libs/openslp-2.0.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source implementation of Service Location Protocol
 EAPI=6
 HOMEPAGE=http://www.openslp.org/
 IUSE=libressl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b0ba97f8aa5fa47f6d46c1c971e756fb
+_md5_=563f4b80e82d574ccd72ed7df9fbb2bf
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.27 b/metadata/md5-cache/net-mail/dovecot-2.2.27
deleted file mode 100644
index 45f1f4bd6eae..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 ~s390 x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.27.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.16.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.16.tar.gz )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ssl-cert	68c8dc51fe1bb63d933af89d431e9132	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=32b11b73c83661636f683ed19901c153
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.28 b/metadata/md5-cache/net-mail/dovecot-2.2.28
deleted file mode 100644
index 4c80beec20e7..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.28.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.17.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.17.tar.gz )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ssl-cert	68c8dc51fe1bb63d933af89d431e9132	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b9b69bf21bb794453addf2bec27cc98d
diff --git a/metadata/md5-cache/net-misc/connman-1.34 b/metadata/md5-cache/net-misc/connman-1.34
new file mode 100644
index 000000000000..d63dede288d9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-1.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 iptables? ( >=net-firewall/iptables-1.4.8 ) bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4 >=net-libs/libmnl-1.0.0 ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Provides a daemon for managing internet connections
+EAPI=6
+HOMEPAGE=https://01.org/connman
+IUSE=bluetooth debug doc examples +ethernet iptables l2tp nftables ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 iptables? ( >=net-firewall/iptables-1.4.8 ) bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4 >=net-libs/libmnl-1.0.0 ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
+REQUIRED_USE=|| ( iptables nftables )
+SLOT=0
+SRC_URI=mirror://kernel/linux/network/connman/connman-1.34.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=fef83c119ff69fb85c40ec85e1607480
diff --git a/metadata/md5-cache/net-misc/putty-0.69 b/metadata/md5-cache/net-misc/putty-0.69
new file mode 100644
index 000000000000..2e4f708b5e4e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/putty-0.69
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 ) dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A Free Telnet/SSH Client
+EAPI=6
+HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
+IUSE=doc +gtk ipv6 kerberos
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 http://the.earth.li/~sgtatham/putty/latest/putty-0.69.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=492bbec57891d51ee0f198b29c71797b
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.25 b/metadata/md5-cache/net-proxy/squid-3.5.25
new file mode 100644
index 000000000000..7f08c7b5dccf
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/squid-3.5.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A full-featured web proxy cache
+EAPI=6
+HOMEPAGE=http://www.squid-cache.org/
+IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
+SLOT=0
+SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.25.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2f52812a17bcf812766f482a3aa59d00
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.18 b/metadata/md5-cache/sys-apps/dbus-1.10.18
index fdd1b44263c5..28e9d8ca9656 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.18
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.18
@@ -4,7 +4,7 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each
 EAPI=6
 HOMEPAGE=https://dbus.freedesktop.org/
 IUSE=debug doc elogind selinux static-libs systemd test user-session X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
 REQUIRED_USE=?? ( elogind systemd )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.18.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=58857529656e9137f034107ae6f79db6
+_md5_=0b19a30a31538bb65a38ba931c1f5a86
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.51 b/metadata/md5-cache/sys-apps/hdparm-9.51
index 367689addb11..8f928c45c190 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.51
+++ b/metadata/md5-cache/sys-apps/hdparm-9.51
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.51.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bedae4f9fd8bcb608dbc9a4f1df3970c
+_md5_=bb56f639bf731f362b559e4cebce862d
diff --git a/metadata/md5-cache/sys-apps/man-pages-4.10 b/metadata/md5-cache/sys-apps/man-pages-4.10
index 79e89e19e50b..9f29dc5b2e9e 100644
--- a/metadata/md5-cache/sys-apps/man-pages-4.10
+++ b/metadata/md5-cache/sys-apps/man-pages-4.10
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=5
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=nls l10n_da l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ro l10n_ru l10n_zh-CN
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=nls? ( l10n_da? ( app-i18n/man-pages-da ) l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ro? ( app-i18n/man-pages-ro ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r3 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.10.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.10.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=bc0007e3065cedacc0d455e798ce7015
+_md5_=911eb76ff445b5a73d0767607811b59a
diff --git a/metadata/md5-cache/sys-apps/man-pages-4.09 b/metadata/md5-cache/sys-apps/man-pages-4.11
similarity index 72%
rename from metadata/md5-cache/sys-apps/man-pages-4.09
rename to metadata/md5-cache/sys-apps/man-pages-4.11
index e5c6375e4771..be470a366623 100644
--- a/metadata/md5-cache/sys-apps/man-pages-4.09
+++ b/metadata/md5-cache/sys-apps/man-pages-4.11
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=5
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=nls l10n_da l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ro l10n_ru l10n_zh-CN
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=nls? ( l10n_da? ( app-i18n/man-pages-da ) l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ro? ( app-i18n/man-pages-ro ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r3 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2
 RESTRICT=binchecks
 SLOT=0
-SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.09.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.09.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=f91674f6534a3c7532f5a7167d0cfa9d
+SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.11.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.11.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=bc0007e3065cedacc0d455e798ce7015
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.7 b/metadata/md5-cache/sys-apps/usbredir-0.7
index 29df1164bb0e..f465518a32e3 100644
--- a/metadata/md5-cache/sys-apps/usbredir-0.7
+++ b/metadata/md5-cache/sys-apps/usbredir-0.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libusb-1.0.19 virtual/pkgconfig
-DESCRIPTION=A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)
+DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
 EAPI=5
 HOMEPAGE=http://spice-space.org/page/UsbRedir
 IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libusb-1.0.19
 SLOT=0
 SRC_URI=http://spice-space.org/download/usbredir/usbredir-0.7.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=06f7e7487f9ef3a7a3362db27877c4c5
+_md5_=618cf3e8f4f42b7cb77020955385f01e
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.7.1 b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
similarity index 65%
rename from metadata/md5-cache/sys-apps/usbredir-0.7.1
rename to metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
index b9225d8ea15e..b72cfd370c4d 100644
--- a/metadata/md5-cache/sys-apps/usbredir-0.7.1
+++ b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libusb-1.0.19 virtual/pkgconfig
-DESCRIPTION=A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)
-EAPI=5
+DEPEND=virtual/libusb:1 virtual/pkgconfig
+DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
+EAPI=6
 HOMEPAGE=http://spice-space.org/page/UsbRedir
 IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/libusb-1.0.19
+RDEPEND=virtual/libusb:1
 SLOT=0
-SRC_URI=http://spice-space.org/download/usbredir/usbredir-0.7.1.tar.bz2
+SRC_URI=http://spice-space.org/download/usbredir/usbredir-0.7.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/usbredir-0.7.1_p20170503-patches.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=66e62c05b20ed71c0da1b6ad732492a4
+_md5_=c1b20f661588a8f47efb01b709abdd1a
diff --git a/metadata/md5-cache/sys-apps/usbredir-9999 b/metadata/md5-cache/sys-apps/usbredir-9999
index ba7ba4190a07..aef840d66dcf 100644
--- a/metadata/md5-cache/sys-apps/usbredir-9999
+++ b/metadata/md5-cache/sys-apps/usbredir-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
-DESCRIPTION=A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)
-EAPI=5
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=virtual/libusb:1 virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
+EAPI=6
 HOMEPAGE=http://spice-space.org/page/UsbRedir
 IUSE=static-libs
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-2	195a672bfaf52d868442171c9469bbb6	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d87eb296855947b0c1b4e302f35f91f8
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=02946525db5d3b00131fcd124df7fe25
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 73e6eb7c8174..79c9d1899682 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170317 virtual/pkgconfig dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170317 virtual/pkgconfig dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Various useful Linux utilities
 EAPI=5
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-2	195a672bfaf52d868442171c9469bbb6	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=56cf21a2a702665075229f618e613693
+_md5_=a95e9bc2432696dfa9c43743601137c0
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.0.0 b/metadata/md5-cache/sys-cluster/hpx-1.0.0
new file mode 100644
index 000000000000..ba34ff6094bd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/hpx-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/pkgconfig test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] ) dev-util/ninja >=dev-util/cmake-3.7.2 virtual/fortran
+DESCRIPTION=C++ runtime system for parallel and distributed applications
+EAPI=6
+HOMEPAGE=http://stellar.cct.lsu.edu/tag/hpx/
+IUSE=doc examples jemalloc papi +perftools tbb test python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
+REQUIRED_USE=test? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) ) jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
+SLOT=0
+SRC_URI=http://stellar.cct.lsu.edu/files/hpx_1.0.0.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=92af9ee76c2d094e6917f318f3efac55
diff --git a/metadata/md5-cache/sys-devel/parity-9999 b/metadata/md5-cache/sys-devel/parity-9999
index b9750837b679..2795d6f48fa5 100644
--- a/metadata/md5-cache/sys-devel/parity-9999
+++ b/metadata/md5-cache/sys-devel/parity-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://github.com/haubi/parity
 LICENSE=LGPL-3
 SLOT=0
 _eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390
-_md5_=7b039565a81155264cb7daba6cfb5517
+_md5_=3d7d2110306d25bad5b0a8cc784ae1f3
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.8.2 b/metadata/md5-cache/sys-firmware/seabios-1.10.2
similarity index 71%
rename from metadata/md5-cache/sys-firmware/seabios-1.8.2
rename to metadata/md5-cache/sys-firmware/seabios-1.10.2
index 22ea7d6ab047..a141eed35105 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.8.2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.10.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEFINED_PHASES=compile configure install pretend setup unpack
 DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.seabios.org/
 IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.8.2.tar.gz ) binary? ( mirror://gentoo/bios.bin-1.8.2.xz seavgabios? ( mirror://gentoo/seavgabios-1.8.2.tar.xz ) )
+SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.2.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.10.2-bin.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=da487fa654e153458d5c481d7bc36eef
+_md5_=1ec7feee9695172ef805f3bdfd468731
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.7.5 b/metadata/md5-cache/sys-firmware/seabios-1.7.5
deleted file mode 100644
index 4e4d0f826ae2..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=5
-HOMEPAGE=https://www.seabios.org/
-IUSE=+binary
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=ppc? ( binary ) ppc64? ( binary )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz ) binary? ( https://code.coreboot.org/p/seabios/downloads/get/bios.bin-1.7.5.gz )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=af339d752e4ef7ea5d2a49b26838642a
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.7.5-r1 b/metadata/md5-cache/sys-firmware/seabios-1.7.5-r1
deleted file mode 100644
index 2fed64668f1b..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.7.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=5
-HOMEPAGE=https://www.seabios.org/
-IUSE=+binary +seavgabios
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=ppc? ( binary ) ppc64? ( binary )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz ) binary? ( https://code.coreboot.org/p/seabios/downloads/get/bios.bin-1.7.5.gz seavgabios? ( mirror://debian/pool/main/s/seabios/seabios_1.7.5-1_all.deb ) )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c8bdfbf0f7cf58cf7999a0af3f5ff0bf
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.7.4 b/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
index 102eef540daa..c93e76d1b40e 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=5
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) static? ( !gcrypt )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.4.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4fe449a9cf0fdaf4977c8310be471dbf
+_md5_=8be5b2fcaf9481959d898475cd3ddb37
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.7.3 b/metadata/md5-cache/sys-fs/cryptsetup-1.7.5
similarity index 67%
rename from metadata/md5-cache/sys-fs/cryptsetup-1.7.3
rename to metadata/md5-cache/sys-fs/cryptsetup-1.7.5
index 6ab9709a120f..67131d6f105c 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.7.3
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.7.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) virtual/pkgconfig static? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/pkgconfig static? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=5
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=+gcrypt kernel nettle openssl libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=+gcrypt kernel nettle openssl libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) static? ( !gcrypt )
+RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) static? ( !gcrypt )
 SLOT=0
-SRC_URI=mirror://kernel/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.3.tar.xz
+SRC_URI=mirror://kernel/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e2520925e927f503c2e4ed9897aad256
+_md5_=1c4fba6e32daf6fe344b91ace9f9362c
diff --git a/metadata/md5-cache/sys-fs/udisks-2.6.4 b/metadata/md5-cache/sys-fs/udisks-2.6.4
new file mode 100644
index 000000000000..c51ebe396392
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-1.3 gnome-base/gnome-common:3 >=sys-kernel/linux-headers-3.1 virtual/pkgconfig nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+IUSE=acl cryptsetup debug +gptfdisk +introspection lvm nls selinux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/archive/udisks-2.6.4.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=4af8e0b9ee20c4149af8bd6328b27747
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.10.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.10.14
new file mode 100644
index 000000000000..ea531060d558
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.10.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.10 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.10.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.10.tar.xz mirror://gentoo/genpatches-4.10-15.base.tar.xz mirror://gentoo/genpatches-4.10-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.10-15.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kernel-2	7cc211cb9f869927ca267873f54d8fd5	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=120a8150c402b8d62811eb47072fffd4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.66
new file mode 100644
index 000000000000..7347a33448e4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.66
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.66
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-69.base.tar.xz mirror://gentoo/genpatches-4.4-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-69.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kernel-2	7cc211cb9f869927ca267873f54d8fd5	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1a6c0d3a9fa52a6f73b84843b6f3b442
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.26 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.26
new file mode 100644
index 000000000000..0feadee5fe8f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.26
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-27.base.tar.xz mirror://gentoo/genpatches-4.9-27.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-27.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kernel-2	7cc211cb9f869927ca267873f54d8fd5	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aa756c58f1ecc6493f52482e64413693
diff --git a/metadata/md5-cache/www-client/firefox-bin-52.1.0 b/metadata/md5-cache/www-client/firefox-bin-52.1.0-r2
similarity index 98%
rename from metadata/md5-cache/www-client/firefox-bin-52.1.0
rename to metadata/md5-cache/www-client/firefox-bin-52.1.0-r2
index b2df1dc14574..50644497ae53 100644
--- a/metadata/md5-cache/www-client/firefox-bin-52.1.0
+++ b/metadata/md5-cache/www-client/firefox-bin-52.1.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.mozilla.com/firefox
 IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ach.xpi -> firefox-52.1.0esr-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/af.xpi -> firefox-52.1.0esr-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/an.xpi -> firefox-52.1.0esr-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ar.xpi -> firefox-52.1.0esr-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/as.xpi -> firefox-52.1.0esr-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ast.xpi -> firefox-52.1.0esr-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/az.xpi -> firefox-52.1.0esr-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/bg.xpi -> firefox-52.1.0esr-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.1.0esr-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.1.0esr-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/br.xpi -> firefox-52.1.0esr-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/bs.xpi -> firefox-52.1.0esr-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ca.xpi -> firefox-52.1.0esr-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/cs.xpi -> firefox-52.1.0esr-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/cy.xpi -> firefox-52.1.0esr-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/da.xpi -> firefox-52.1.0esr-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/de.xpi -> firefox-52.1.0esr-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/el.xpi -> firefox-52.1.0esr-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.1.0esr-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.1.0esr-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/eo.xpi -> firefox-52.1.0esr-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.1.0esr-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.1.0esr-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.1.0esr-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.1.0esr-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/et.xpi -> firefox-52.1.0esr-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/eu.xpi -> firefox-52.1.0esr-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/fa.xpi -> firefox-52.1.0esr-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/fi.xpi -> firefox-52.1.0esr-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/fr.xpi -> firefox-52.1.0esr-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.1.0esr-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.1.0esr-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/gd.xpi -> firefox-52.1.0esr-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/gl.xpi -> firefox-52.1.0esr-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.1.0esr-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/he.xpi -> firefox-52.1.0esr-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.1.0esr-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/hr.xpi -> firefox-52.1.0esr-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.1.0esr-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/hu.xpi -> firefox-52.1.0esr-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.1.0esr-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/id.xpi -> firefox-52.1.0esr-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/is.xpi -> firefox-52.1.0esr-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/it.xpi -> firefox-52.1.0esr-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ja.xpi -> firefox-52.1.0esr-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/kk.xpi -> firefox-52.1.0esr-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/km.xpi -> firefox-52.1.0esr-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/kn.xpi -> firefox-52.1.0esr-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ko.xpi -> firefox-52.1.0esr-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/lt.xpi -> firefox-52.1.0esr-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/lv.xpi -> firefox-52.1.0esr-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/mai.xpi -> firefox-52.1.0esr-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/mk.xpi -> firefox-52.1.0esr-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ml.xpi -> firefox-52.1.0esr-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/mr.xpi -> firefox-52.1.0esr-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ms.xpi -> firefox-52.1.0esr-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.1.0esr-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/nl.xpi -> firefox-52.1.0esr-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.1.0esr-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/or.xpi -> firefox-52.1.0esr-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.1.0esr-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/pl.xpi -> firefox-52.1.0esr-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.1.0esr-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/rm.xpi -> firefox-52.1.0esr-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ro.xpi -> firefox-52.1.0esr-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ru.xpi -> firefox-52.1.0esr-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/si.xpi -> firefox-52.1.0esr-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/sk.xpi -> firefox-52.1.0esr-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/sl.xpi -> firefox-52.1.0esr-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/son.xpi -> firefox-52.1.0esr-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/sq.xpi -> firefox-52.1.0esr-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/sr.xpi -> firefox-52.1.0esr-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.1.0esr-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/ta.xpi -> firefox-52.1.0esr-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/te.xpi -> firefox-52.1.0esr-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/th.xpi -> firefox-52.1.0esr-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/tr.xpi -> firefox-52.1.0esr-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/uk.xpi -> firefox-52.1.0esr-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/uz.xpi -> firefox-52.1.0esr-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/vi.xpi -> firefox-52.1.0esr-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/xh.xpi -> firefox-52.1.0esr-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.1.0esr-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.1.0esr/linux-x86_64/en-US/firefox-52.1.0esr.tar.bz2 -> firefox-bin_x86_64-52.1.0.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.1.0esr/linux-i686/en-US/firefox-52.1.0esr.tar.bz2 -> firefox-bin_i686-52.1.0.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=837118a47e6eb66f1d4fbe3bede7a0d0
+_md5_=ae475000731b9a0d3521028d951545e1
diff --git a/metadata/md5-cache/www-client/firefox-bin-53.0 b/metadata/md5-cache/www-client/firefox-bin-53.0-r2
similarity index 98%
rename from metadata/md5-cache/www-client/firefox-bin-53.0
rename to metadata/md5-cache/www-client/firefox-bin-53.0-r2
index a3e2fdce9e4a..8cf22f2ef52f 100644
--- a/metadata/md5-cache/www-client/firefox-bin-53.0
+++ b/metadata/md5-cache/www-client/firefox-bin-53.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
 DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
 DESCRIPTION=Firefox Web Browser
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.mozilla.com/firefox
 IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ach.xpi -> firefox-53.0-ach.xpi ) l10n_af? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/af.xpi -> firefox-53.0-af.xpi ) l10n_an? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/an.xpi -> firefox-53.0-an.xpi ) l10n_ar? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ar.xpi -> firefox-53.0-ar.xpi ) l10n_as? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/as.xpi -> firefox-53.0-as.xpi ) l10n_ast? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ast.xpi -> firefox-53.0-ast.xpi ) l10n_az? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/az.xpi -> firefox-53.0-az.xpi ) l10n_bg? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/bg.xpi -> firefox-53.0-bg.xpi ) l10n_bn-BD? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/bn-BD.xpi -> firefox-53.0-bn-BD.xpi ) l10n_bn-IN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/bn-IN.xpi -> firefox-53.0-bn-IN.xpi ) l10n_br? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/br.xpi -> firefox-53.0-br.xpi ) l10n_bs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/bs.xpi -> firefox-53.0-bs.xpi ) l10n_ca? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ca.xpi -> firefox-53.0-ca.xpi ) l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/cs.xpi -> firefox-53.0-cs.xpi ) l10n_cy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/cy.xpi -> firefox-53.0-cy.xpi ) l10n_da? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/da.xpi -> firefox-53.0-da.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/de.xpi -> firefox-53.0-de.xpi ) l10n_el? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/el.xpi -> firefox-53.0-el.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/en-GB.xpi -> firefox-53.0-en-GB.xpi ) l10n_en-ZA? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/en-ZA.xpi -> firefox-53.0-en-ZA.xpi ) l10n_eo? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/eo.xpi -> firefox-53.0-eo.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/es-AR.xpi -> firefox-53.0-es-AR.xpi ) l10n_es-CL? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/es-CL.xpi -> firefox-53.0-es-CL.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/es-ES.xpi -> firefox-53.0-es-ES.xpi ) l10n_es-MX? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/es-MX.xpi -> firefox-53.0-es-MX.xpi ) l10n_et? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/et.xpi -> firefox-53.0-et.xpi ) l10n_eu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/eu.xpi -> firefox-53.0-eu.xpi ) l10n_fa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/fa.xpi -> firefox-53.0-fa.xpi ) l10n_fi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/fi.xpi -> firefox-53.0-fi.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/fr.xpi -> firefox-53.0-fr.xpi ) l10n_fy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/fy-NL.xpi -> firefox-53.0-fy-NL.xpi ) l10n_ga? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ga-IE.xpi -> firefox-53.0-ga-IE.xpi ) l10n_gd? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/gd.xpi -> firefox-53.0-gd.xpi ) l10n_gl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/gl.xpi -> firefox-53.0-gl.xpi ) l10n_gu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/gu-IN.xpi -> firefox-53.0-gu-IN.xpi ) l10n_he? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/he.xpi -> firefox-53.0-he.xpi ) l10n_hi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/hi-IN.xpi -> firefox-53.0-hi-IN.xpi ) l10n_hr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/hr.xpi -> firefox-53.0-hr.xpi ) l10n_hsb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/hsb.xpi -> firefox-53.0-hsb.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/hu.xpi -> firefox-53.0-hu.xpi ) l10n_hy? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/hy-AM.xpi -> firefox-53.0-hy-AM.xpi ) l10n_id? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/id.xpi -> firefox-53.0-id.xpi ) l10n_is? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/is.xpi -> firefox-53.0-is.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/it.xpi -> firefox-53.0-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ja.xpi -> firefox-53.0-ja.xpi ) l10n_kk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/kk.xpi -> firefox-53.0-kk.xpi ) l10n_km? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/km.xpi -> firefox-53.0-km.xpi ) l10n_kn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/kn.xpi -> firefox-53.0-kn.xpi ) l10n_ko? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ko.xpi -> firefox-53.0-ko.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/lt.xpi -> firefox-53.0-lt.xpi ) l10n_lv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/lv.xpi -> firefox-53.0-lv.xpi ) l10n_mai? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/mai.xpi -> firefox-53.0-mai.xpi ) l10n_mk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/mk.xpi -> firefox-53.0-mk.xpi ) l10n_ml? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ml.xpi -> firefox-53.0-ml.xpi ) l10n_mr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/mr.xpi -> firefox-53.0-mr.xpi ) l10n_ms? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ms.xpi -> firefox-53.0-ms.xpi ) l10n_nb? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/nb-NO.xpi -> firefox-53.0-nb-NO.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/nl.xpi -> firefox-53.0-nl.xpi ) l10n_nn? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/nn-NO.xpi -> firefox-53.0-nn-NO.xpi ) l10n_or? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/or.xpi -> firefox-53.0-or.xpi ) l10n_pa? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/pa-IN.xpi -> firefox-53.0-pa-IN.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/pl.xpi -> firefox-53.0-pl.xpi ) l10n_pt-BR? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/pt-BR.xpi -> firefox-53.0-pt-BR.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/pt-PT.xpi -> firefox-53.0-pt-PT.xpi ) l10n_rm? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/rm.xpi -> firefox-53.0-rm.xpi ) l10n_ro? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ro.xpi -> firefox-53.0-ro.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ru.xpi -> firefox-53.0-ru.xpi ) l10n_si? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/si.xpi -> firefox-53.0-si.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/sk.xpi -> firefox-53.0-sk.xpi ) l10n_sl? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/sl.xpi -> firefox-53.0-sl.xpi ) l10n_son? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/son.xpi -> firefox-53.0-son.xpi ) l10n_sq? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/sq.xpi -> firefox-53.0-sq.xpi ) l10n_sr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/sr.xpi -> firefox-53.0-sr.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/sv-SE.xpi -> firefox-53.0-sv-SE.xpi ) l10n_ta? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/ta.xpi -> firefox-53.0-ta.xpi ) l10n_te? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/te.xpi -> firefox-53.0-te.xpi ) l10n_th? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/th.xpi -> firefox-53.0-th.xpi ) l10n_tr? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/tr.xpi -> firefox-53.0-tr.xpi ) l10n_uk? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/uk.xpi -> firefox-53.0-uk.xpi ) l10n_uz? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/uz.xpi -> firefox-53.0-uz.xpi ) l10n_vi? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/vi.xpi -> firefox-53.0-vi.xpi ) l10n_xh? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/xh.xpi -> firefox-53.0-xh.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/zh-CN.xpi -> firefox-53.0-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases//53.0/linux-i686/xpi/zh-TW.xpi -> firefox-53.0-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/53.0/linux-x86_64/en-US/firefox-53.0.tar.bz2 -> firefox-bin_x86_64-53.0.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/firefox/releases/53.0/linux-i686/en-US/firefox-53.0.tar.bz2 -> firefox-bin_i686-53.0.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	0236be304ee52e7f179ed2f337075515	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c6af72d6d60eb446101bf7c71c9dc31f
+_md5_=21a719d01cbec6fed2b2d0026f46161f
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.29 b/metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.36
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.29
rename to metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.36
index da45366f0f24..92e7156727ef 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.29
+++ b/metadata/md5-cache/www-client/google-chrome-beta-59.0.3071.36
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_59.0.3071.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_59.0.3071.36-1_amd64.deb
 _eclasses_=chromium-2	0668536c674abbd0cfa509b879fc1b74	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.29_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.36_beta
similarity index 92%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.29_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.36_beta
index 640e32d06958..8052c599d783 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.29_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-59.0.3071.36_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_59.0.3071.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_59.0.3071.36-1_amd64.deb
 _eclasses_=multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r1
index 2af1ded36995..fe60f289b28c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r1
@@ -9,6 +9,6 @@ LICENSE=GPL-2 NVIDIA-r1
 RDEPEND=>=app-eselect/eselect-opengl-1.0.9 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) <x11-base/xorg-server-1.15.99:= acpi? ( sys-power/acpid ) multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) kernel_linux? ( virtual/modutils )
 RESTRICT=bindist mirror strip
 SLOT=0/173
-SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/173.14.39/NVIDIA-Linux-x86-173.14.39-pkg0.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/173.14.39/NVIDIA-Linux-x86_64-173.14.39-pkg2.run ) x86-fbsd? ( http://us.download.nvidia.com/freebsd/173.14.39/NVIDIA-FreeBSD-x86-173.14.39.tar.gz )
+SRC_URI=x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/173.14.39/NVIDIA-Linux-x86-173.14.39-pkg0.run ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/173.14.39/NVIDIA-Linux-x86_64-173.14.39-pkg2.run ) x86-fbsd? ( http://http.download.nvidia.com/freebsd/173.14.39/NVIDIA-FreeBSD-x86-173.14.39.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=dc3acb8f0454a0d918dfaf6ecd6eb440
+_md5_=ceb8cb53c923fa00d61d68619c315852
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r2
index d42f49132a67..4353364b3f9c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.39-r2
@@ -9,6 +9,6 @@ LICENSE=GPL-2 NVIDIA-r1
 RDEPEND=>=app-eselect/eselect-opengl-1.0.9 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) <x11-base/xorg-server-1.15.99:= sys-libs/zlib >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) kernel_linux? ( virtual/modutils )
 RESTRICT=bindist mirror strip
 SLOT=0/173
-SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/173.14.39/NVIDIA-Linux-x86-173.14.39-pkg0.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/173.14.39/NVIDIA-Linux-x86_64-173.14.39-pkg2.run ) x86-fbsd? ( http://us.download.nvidia.com/freebsd/173.14.39/NVIDIA-FreeBSD-x86-173.14.39.tar.gz )
+SRC_URI=x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/173.14.39/NVIDIA-Linux-x86-173.14.39-pkg0.run ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/173.14.39/NVIDIA-Linux-x86_64-173.14.39-pkg2.run ) x86-fbsd? ( http://http.download.nvidia.com/freebsd/173.14.39/NVIDIA-FreeBSD-x86-173.14.39.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=83c122001e02cdea22330f20f3894274
+_md5_=80dc8a2267837fecdc978539f67742c2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.135 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.135
index 859d0ed48862..72b7d9f0786c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.135
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.135
@@ -11,6 +11,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/304
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/304.135/NVIDIA-FreeBSD-x86_64-304.135.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/304.135/NVIDIA-Linux-x86_64-304.135.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/304.135/NVIDIA-FreeBSD-x86-304.135.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/304.135/NVIDIA-Linux-x86-304.135.run ) tools? ( http://us.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.135.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/304.135/NVIDIA-FreeBSD-x86_64-304.135.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/304.135/NVIDIA-Linux-x86_64-304.135.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/304.135/NVIDIA-FreeBSD-x86-304.135.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/304.135/NVIDIA-Linux-x86-304.135.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.135.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a5ad6a923f730b81a79f2d1bb157c627
+_md5_=1c830286a2be271c5cda9fda87ea4e52
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.102 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.102
index 7122db57173e..44c38329271b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.102
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.102
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.102/NVIDIA-FreeBSD-x86_64-340.102.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/340.102/NVIDIA-Linux-x86_64-340.102.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/340.102/NVIDIA-FreeBSD-x86-340.102.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/340.102/NVIDIA-Linux-x86-340.102.run ) tools? ( http://us.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.102.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/340.102/NVIDIA-FreeBSD-x86_64-340.102.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/340.102/NVIDIA-Linux-x86_64-340.102.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/340.102/NVIDIA-FreeBSD-x86-340.102.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/340.102/NVIDIA-Linux-x86-340.102.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.102.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7786ceb9a99c0defbd893c7291e6d7bb
+_md5_=3b927e15c83b0b3c3b541173b85adb47
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.39 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.39
index 4bddafc2f80b..e70be1b2d7ec 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.39
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.39
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/375
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/375.39/NVIDIA-FreeBSD-x86_64-375.39.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/375.39/NVIDIA-Linux-x86_64-375.39.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/375.39/NVIDIA-Linux-armv7l-gnueabihf-375.39.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/375.39/NVIDIA-FreeBSD-x86-375.39.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/375.39/NVIDIA-Linux-x86-375.39.run ) tools? ( http://us.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/375.39/NVIDIA-FreeBSD-x86_64-375.39.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/375.39/NVIDIA-Linux-x86_64-375.39.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-x86-ARM/375.39/NVIDIA-Linux-armv7l-gnueabihf-375.39.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/375.39/NVIDIA-FreeBSD-x86-375.39.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/375.39/NVIDIA-Linux-x86-375.39.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4a2f07e0a82dc78539dd64137d990683
+_md5_=3f5c95162e789e52a824cdf58d24d5a2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13 b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13
index 097e071fa368..36d3c355b77a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/378
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( http://us.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-378.13.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-x86-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-378.13.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f8f50886a582e33e691127a195c43a02
+_md5_=2f4b2731bfca705eaac263fcea97d515
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.09 b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.09
index 0edcb4ac98dc..7847edbda493 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.09
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.09
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/381
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/381.09/NVIDIA-FreeBSD-x86_64-381.09.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/381.09/NVIDIA-Linux-x86_64-381.09.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/381.09/NVIDIA-Linux-armv7l-gnueabihf-381.09.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/381.09/NVIDIA-FreeBSD-x86-381.09.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run ) tools? ( http://us.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-381.09.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/381.09/NVIDIA-FreeBSD-x86_64-381.09.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/381.09/NVIDIA-Linux-x86_64-381.09.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-x86-ARM/381.09/NVIDIA-Linux-armv7l-gnueabihf-381.09.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/381.09/NVIDIA-FreeBSD-x86-381.09.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-381.09.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=58fb4c3cd57b6e79c396be835cc0fcdf
+_md5_=1d363dc9c019f4e2992516a38abc1f75
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.23-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.23-r1
index b3ff17baf29a..64093c805f2f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.23-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.23-r1
@@ -9,6 +9,6 @@ LICENSE=GPL-2 NVIDIA-r1
 RDEPEND=kernel_linux? ( >=sys-libs/glibc-2.6.1 ) >=app-eselect/eselect-opengl-1.0.9 <x11-base/xorg-server-1.12.99:= acpi? ( sys-power/acpid ) gtk? ( !media-video/nvidia-settings dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] x11-libs/pangox-compat ) multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) kernel_linux? ( virtual/modutils )
 RESTRICT=bindist mirror strip
 SLOT=0/96
-SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/96.43.23/NVIDIA-Linux-x86-96.43.23-pkg0.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg2.run ) x86-fbsd? ( http://us.download.nvidia.com/freebsd/96.43.23/NVIDIA-FreeBSD-x86-96.43.23.tar.gz )
+SRC_URI=x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/96.43.23/NVIDIA-Linux-x86-96.43.23-pkg0.run ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg2.run ) x86-fbsd? ( http://http.download.nvidia.com/freebsd/96.43.23/NVIDIA-FreeBSD-x86-96.43.23.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2d6652b0a6bb9aaa92d9297f098ae76e
+_md5_=94626bdae546a6d14bfb5139d2b1655d
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1 b/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1
index cb451bc6dde8..b76b2772f8bc 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1
+++ b/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1
@@ -3,10 +3,10 @@ DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pi
 DESCRIPTION=Mozilla extension to provide GPG support in mail clients
 EAPI=6
 HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-3
 RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
 SLOT=0
 SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.6.1.tar.gz
 _eclasses_=multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3d1ad3c3f28c3bedf64b10fa772606b1
+_md5_=9eae1404364d468f5f995bb680f7a76b
diff --git a/metadata/md5-cache/x11-plugins/enigmail-9999 b/metadata/md5-cache/x11-plugins/enigmail-9999
new file mode 100644
index 000000000000..407248c79cb7
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=6
+HOMEPAGE=http://www.enigmail.net/
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
+SLOT=0
+_eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390	multilib	0236be304ee52e7f179ed2f337075515	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	c11fc374357e6ad9ddfe2e9f931e4d29	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=7a5d90700f378fd941586eb007a4fb26
diff --git a/metadata/md5-cache/x11-plugins/purple-facebook-20170330 b/metadata/md5-cache/x11-plugins/purple-facebook-20170330
new file mode 100644
index 000000000000..a567319abc4b
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/purple-facebook-20170330
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/json-glib net-im/pidgin >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Facebook protocol plugin for libpurple
+EAPI=6
+HOMEPAGE=https://github.com/dequis/purple-facebook
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/json-glib net-im/pidgin
+SLOT=0
+SRC_URI=https://github.com/dequis/purple-facebook/releases/download/v0.9.3-c9b74a765767/purple-facebook-0.9.3-c9b74a765767.tar.gz -> purple-facebook-20170330.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=764795955a05d46e23ead1193de682b5
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2 b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
index 30fe31151c15..8910c23808a6 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.6.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a6f8692c26ef6216ff9ddff38ef4b5c2
+_md5_=9a5bf3d9dd99fc8ce9d8d54c27237e0a
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.7 b/metadata/md5-cache/x11-wm/awesome-3.5.7
index 900954345c7d..f280d178f46b 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.7
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.7
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.7.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=186d9f3efb8fdc8e006eb7c788ada700
+_md5_=767bec19b2a9b22a392345a4549c46b1
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.8 b/metadata/md5-cache/x11-wm/awesome-3.5.8
index c92349533bd2..00329834c04b 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.8
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.8
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.8.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=186d9f3efb8fdc8e006eb7c788ada700
+_md5_=767bec19b2a9b22a392345a4549c46b1
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.9 b/metadata/md5-cache/x11-wm/awesome-3.5.9
index b80a593babfb..268042227baa 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.9
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.9
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.9.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=186d9f3efb8fdc8e006eb7c788ada700
+_md5_=767bec19b2a9b22a392345a4549c46b1
diff --git a/metadata/md5-cache/x11-wm/awesome-4.0 b/metadata/md5-cache/x11-wm/awesome-4.0
index 9cc4546e6baa..91d384731921 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.0
+++ b/metadata/md5-cache/x11-wm/awesome-4.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3432bdc32e0fe364b6677408fd124c39
+_md5_=7408d7b0576de8c637c7d497a3a91b08
diff --git a/metadata/md5-cache/x11-wm/awesome-4.0-r1 b/metadata/md5-cache/x11-wm/awesome-4.0-r1
index 15376e0bbbd4..d78f154e41ca 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.0-r1
+++ b/metadata/md5-cache/x11-wm/awesome-4.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.0.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e0f79d9fd3a99606f6e4e9890239c00e
+_md5_=03a18583434153f2b677ac4b29112bfc
diff --git a/metadata/md5-cache/x11-wm/awesome-4.1 b/metadata/md5-cache/x11-wm/awesome-4.1
index 42c78ba90bd7..7a9d58a57203 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.1
+++ b/metadata/md5-cache/x11-wm/awesome-4.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-l
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.1.tar.xz
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5739c709e12d3b1f3d3bcd01bd4dcfae
+_md5_=c1e01cba5bc2bb2e0d17ee665a695d84
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index 7b32bf035a88..c2ac683306db 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
 SLOT=0
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b97f21c9059966bd8db3162ac4649026
+_md5_=d9a38f6ec2eb47a81c205cc806ebdea0
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9e5e19c221e9..6fc720a2fac7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 03 May 2017 04:39:39 +0000
+Thu, 04 May 2017 08:08:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1df90c819683..ecfe9b9b8dcb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May  3 04:39:39 UTC 2017
+Thu May  4 08:08:49 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 145621de8593..8c3c1a13348f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 03 May 2017 05:00:01 +0000
+Thu, 04 May 2017 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 0b385b8c1dee..64cc9c05ea69 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b767a1041a9587db2c50a847eef2c68a94393633 1493785775 2017-05-03T04:29:35+00:00
+a4040e3ef1af2f78f3cdf4418ca57c4119903908 1493884386 2017-05-04T07:53:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 97a489f42bbc..70698911072f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1493786101 Wed 03 May 2017 04:35:01 AM UTC
+1493885101 Thu 04 May 2017 08:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9e5e19c221e9..6fc720a2fac7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 03 May 2017 04:39:39 +0000
+Thu, 04 May 2017 08:08:49 +0000
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 1fff86a96ceb..ce72db3d5a6e 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,5 +1,4 @@
-DIST libmicrohttpd-0.9.47.tar.gz 1075636 SHA256 96bdab4352a09fd3952a346bc01898536992f50127d0adea1c3096a8ec9f658c SHA512 c6a0d8602246c72bdec63140310fa72f1e73b569ffec5a46bddd92b8be434b334c74f9afb2fab828dd3e0387f02ac5f518580d13c5e7548dc0367e43233196c7 WHIRLPOOL 0087f9856ffd9fae983b7c82d82254f5dc3c416c0cdd9d2b8318793a0d727eb3f1dd038f4d222817cb665d17e912dbbc2f765ae3a06c010d35e53b0d332c108e
-DIST libmicrohttpd-0.9.49.tar.gz 1087716 SHA256 9407d8252548ab97ace3276e0032f073820073c0599d43baff832902a8dab11c SHA512 9bae8d187e9567ef706a6d1b806417f2b5f667195adf7a86f96f156982e4cbcf472da10b3220c0679aeceb2c74e7778153160f3b697ac7444de038505b6e94f8 WHIRLPOOL 837c8612eb227c266ed3af773912bdbc215cbadc29766c5de10bce4a0588301213ea6ea140d3c15e6ec96c3dc3bc6b50caee892f30350d1c5e05b83639a61223
 DIST libmicrohttpd-0.9.51.tar.gz 1114110 SHA256 3000bb0ba219061f2ea60251b8ea3d5f694e8c6ce1706bbff57e7e24867a23c7 SHA512 462178033d5fabc53885189a7f73a343a1a0d2f54e8ff6310a3e74ace3316567927c453773e62ff35150ec36658605d6d0a9c1c38c5d3186d543ca313f4a5912 WHIRLPOOL 9c68282e4f423f251e950f0016d3394c7ce97c85e86a57525a31f832fd2b6b32790a0395a0a0701ad0f4104ff575488ffaed547684d7c3f6f809a3e92bde464d
 DIST libmicrohttpd-0.9.52.tar.gz 1244489 SHA256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4 WHIRLPOOL b70f91dba5e6e69fe42066345d51bb72248b1c4271fa88c0599d78adf17b3eb79144e5a83159f1636a79a6c9081ebb6274d90fa307d4f78a3edbfc7e0d6bd10a
 DIST libmicrohttpd-0.9.53.tar.gz 1301214 SHA256 9b15ec2d381f44936323adfd4f989fa35add517cccbbfa581896b02a393c2cc4 SHA512 2e29595c980cdcf12c1cead62f8938cc32e8c93d3a848e7473c5d5f596c6b6858732df0a3293b93d89577e5a325a62fe82adf3921a76d7184a647489364d7e2c WHIRLPOOL 940eb42aaca8581ab7c7f2f3f6c246bf001956965d5529491d780f377eb00cffbf28aec3069b6a8eb691a78d84e77555ec5554b10ce066a11333d6cae19641a4
+DIST libmicrohttpd-0.9.54.tar.gz 1309560 SHA256 bcc721895d4a114b0548a39d2241c35caacb9e2e072d40e11b55c60e3d5ddcbe SHA512 d3276ad3af123aacc5ff885786861ccc94397576b81999974456b9b803fe5d911115f6595281ffce2240087f98a6527a840506eabeec9f2589d555fd235b6c89 WHIRLPOOL 5d5c099ea269c3d767b6d3f706453ec31b584c74fc01cbfc55ba0a54ce902611853cfeca7f7c8cc3f3c47147cb3db7cea3730abc86174f5d857471d75013b2c5
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
deleted file mode 100644
index 71f0727e7943..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--runstatedir=/run \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild
similarity index 87%
rename from net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild
rename to net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild
index e4e6272d97c1..d782c539ac31 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 MY_P="${P/_/}"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
@@ -36,7 +36,7 @@ src_configure() {
 		--enable-dauth \
 		--disable-examples \
 		--enable-postprocessor \
-		--runstatedir=/run \
+		--disable-thread-names \
 		$(use_enable epoll) \
 		$(use_enable test curl) \
 		$(use_enable messages) \
diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 7ffcf664fe99..77f95cf3f08f 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7d880422d111..443adbf17fe8 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,8 +1,4 @@
-DIST dovecot-2.2-pigeonhole-0.4.16.tar.gz 1713634 SHA256 8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234 SHA512 5f59fb35dbe638f8ddd19c0fd0f3fbd6fec1fa238f3781b94c50a8f7ce72a53ac1381a6f8ad9bcc90df1edfa2b263a6dfba88521578e55ce4b3d840bed022b79 WHIRLPOOL 5e037d1e271b9c12a111966306c30536035126e9ba1213697804614d8a3d38996b117b37a744cb5b97873e136bddf110177c501d46c5ce0ffd2110932b911f00
-DIST dovecot-2.2-pigeonhole-0.4.17.tar.gz 1787177 SHA256 74d869c7532cbf4fe41e3cc95a1aa6ce32e98f4d423f0d099da1e0fba022dae3 SHA512 3ea6faebf04154649c32612f204e909aa131582c99867865bff3d3a78a75593d96109586eeb6403bc915046b8b6f02e8bacbf6cb6733ea186d2e1a209a7e2b79 WHIRLPOOL bccf0c679c627cd791af69e8f7efa232b6448d7246af0108c3917ab9f65fc16ca860240c8b69fa8dda23d7b3b485fc9527bfca33bc49b42a10d84a29897a2a3b
 DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 SHA256 dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4 WHIRLPOOL 809ca6efbdf8688087bbfa48902d7c5467a5313135ce23d621eb84541854140e48c94e7ce8180f9e64816df8c1faf85a8cb42c29bf749da1eb7ebfb125469080
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
 DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
-DIST dovecot-2.2.27.tar.gz 5794668 SHA256 897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9 SHA512 faab441bb2afa1e6de3e6ec6207c92a333773941bbc10c4761483ef6ccc193d3a4983de1acc73325122c22b197ea25c1e54886cccfb6b060ede90936a69b71f2 WHIRLPOOL dd17a079118a300a56b26c48c152e44267f69a2138af066944a207ca5851c4b430a40c8553a794061321b67b2e5d7f721ba897b7a17826651c884db72e6d4424
-DIST dovecot-2.2.28.tar.gz 5921992 SHA256 e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25 SHA512 3f40eb52413130dd47da98470d797ede63db3296923c2888b48f1a021e473cfcad064671ad804037d101990457ee57def30f2c27010ede2d758f3d3cfd8ef741 WHIRLPOOL cb92cdafcbfa2d42d9a7c16d20495e3d6828c8f836341a736d740df51e246c40f75417d8959bd5c9a4429f2217790f0edde262806d62a643a8d0da8b76db9600
 DIST dovecot-2.2.29.1.tar.gz 5972119 SHA256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111 WHIRLPOOL 97a3b45191a32e78a08b4113a6e8b34e0bc538ec8359210d0bdf63990246af89be25cdaf9017c46f3107a7ec82758fa25820d61c25eda94f14ce7351d3aaea7a
diff --git a/net-mail/dovecot/dovecot-2.2.27.ebuild b/net-mail/dovecot/dovecot-2.2.27.ebuild
deleted file mode 100644
index 8ea052c39ddc..000000000000
--- a/net-mail/dovecot/dovecot-2.2.27.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.16"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~s390 x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.28.ebuild b/net-mail/dovecot/dovecot-2.2.28.ebuild
deleted file mode 100644
index cc8d45d58f64..000000000000
--- a/net-mail/dovecot/dovecot-2.2.28.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.17"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index d8652b5e631e..c75b175503b2 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,2 +1,3 @@
 DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
 DIST connman-1.33.tar.xz 669800 SHA256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 SHA512 5670124d2e17ffde4bd5fb878198843b712a31f5840e8523e8247373c8547619e32a4d6dda9cf993eebd5c65bdd256cfc570708a79da1d10f969662b5b750566 WHIRLPOOL eda8176d0d6137b0b94581c9ace23367d7af5722b7d7ea53e173e9466b555f26c9a18a05a07c1533ab11e3197e4303c6c77685a214c3dec2de926d7924f019f2
+DIST connman-1.34.tar.xz 684992 SHA256 a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e SHA512 732669648936630ae5895cba8bcccc69757ab594bc31ee8e4925b0e402d190939891fac61136f3f086ce708b8d576136f0947914c0cc07427c170cbf9b85a308 WHIRLPOOL bf349ff1f8709e2325d0c316cef922358115c1e9b340b27866d19e03dad98a563f20405ef8290610960b8a33b6de6fbdc717bf958322553fa02da0fba76b3a3a
diff --git a/net-misc/connman/connman-1.34.ebuild b/net-misc/connman/connman-1.34.ebuild
new file mode 100644
index 000000000000..b141c8385a0c
--- /dev/null
+++ b/net-misc/connman/connman-1.34.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools systemd
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
+IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
+
+REQUIRED_USE="|| ( iptables nftables )"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	bluetooth? ( net-wireless/bluez )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4
+		>=net-libs/libmnl-1.0.0 )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir=${EPRIFEX}/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-iwd \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 195ba7c0cfe4..a4bbe92fa34b 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
+		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as firewall.</flag>
+		<flag name="nftables">Use <pkg>net-firewall/nftables</pkg> as firewall.</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
 		<flag name="openconnect">Use <pkg>net-vpn/openconnect</pkg> for VPN support.</flag>
 		<flag name="openvpn">Use <pkg>net-vpn/openvpn</pkg> for openvpn support.</flag>
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index e99ecbaae2ee..b47b4b9c6a34 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
 DIST putty-0.68.tar.gz 2114499 SHA256 7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 WHIRLPOOL d24ceb3ed62eca52bb3a8f4fae08256269002265650e6fc42af10fc10a7b85b677b70c68e6b0a98915371921eabfbcbfa8a9b64b6be1a51cff418aef2feb6650
+DIST putty-0.69.tar.gz 2122306 SHA256 b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 SHA512 2739829adec60df5658709d61f8539d431f6b5d71b9b893fcefb2a04ac52bf2ace26f9ca784156d6540fa3f3e5858a86eb2921002b4cc05f9fbf22da7931ec2a WHIRLPOOL 7f003a0bc0f94c14aa3ea5c0b38bbe7fd9dbc6e92d7fac1a4aa004c775d567db49526439c7ed6fe37eb5e345b499ace3a27dd218cdf97d81eeb4bf4d0ea83343
 DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
diff --git a/net-misc/putty/putty-0.69.ebuild b/net-misc/putty/putty-0.69.ebuild
new file mode 100644
index 000000000000..448708462c89
--- /dev/null
+++ b/net-misc/putty/putty-0.69.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk ipv6 kerberos"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	cd "${S}"/unix || die
+	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index a5d8c08465bd..9c27650a5306 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,2 +1,3 @@
 DIST squid-3.5.23.tar.xz 2325884 SHA256 fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb SHA512 3f2b3df60fc0b2aab3d0d9e3489832d60d0aac8222f09ad2ff6afb95202b904f41f6530d713e7ce446c6f62b66f0cd792a6b12005d43c53fe68d2371f9caa880 WHIRLPOOL 39338be97e3357759b9062e3c3b353a2118ca910e56584e73560489078e76a42b230ac24468ea62f6e3df7de210492beda54b0c178804c097d4b303d16cd2914
 DIST squid-3.5.24.tar.xz 2326424 SHA256 4fe29f582eef357faa541a53835b6885e24e6f28b80a3abcdf3b57f5393bbdb2 SHA512 912a0882c71ba170e7c2eccf940cfca87d7fd0a6026a7aaa9dddacc1e17590809ad449e15913d180d5ce5b8d2828a68247ab920a4a499f3ee29ddd464e29344f WHIRLPOOL 1d245ee3bd6eff69b201ee1c57671617d06e36663d38d44bf4335ca1ebee251c0983f1f041c00cc823d7c5fc04d0a3725197beac407e2bfcfe81f679bc96f3a0
+DIST squid-3.5.25.tar.xz 2327316 SHA256 28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585 SHA512 9adfadd962954537c3364543ce4ca862e6f60801f1fb80bc3b74fbd99b60219aed4756affff8f7d956337f4b573d0ebecad01f689d0c6554aa2958f5bcfb972f WHIRLPOOL d29a4591fc8521e3ebd864d547c86341136b1aefa7679d35a01e5fcc102b4dfe1e340089f9e7ba9489911fbcd6a1e61a4715e1669348aa6e8a4379471ab18ec6
diff --git a/net-proxy/squid/squid-3.5.25.ebuild b/net-proxy/squid/squid-3.5.25.ebuild
new file mode 100644
index 000000000000..b499ec5ba110
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.25.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info pam toolchain-funcs user
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? (
+		libressl? ( dev-libs/libressl:0 )
+		!libressl? ( dev-libs/openssl:0 )
+		dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-ltdl-includedir=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dodoc RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3f4bfbfbfc97..c00ae45e7957 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -45,6 +45,8 @@ media-libs/opensubdiv opencl
 # Ian Stakenvicius (25 Jan 2017)
 # rust on mozilla packages is experimental
 www-client/firefox rust
+www-client/seamonkey rust
+mail-client/thunderbird rust
 
 # Lars Wendler <polynomial-c@gentoo.org> (19 Jan 2017)
 # Masked until system heimdal can finally be used with AD DC
diff --git a/profiles/package.mask b/profiles/package.mask
index 075fa3be7cf4..a478e80c852a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (03 May 2017)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-60
+
 # Michał Górny <mgorny@gentoo.org> (01 May 2017)
 # Used only by old (removed) versions of dev-python/google-apitools.
 # Last release in 2015. Removal in 30 days.
@@ -69,7 +74,6 @@ dev-ruby/coffee-rails:4.0
 dev-ruby/jquery-ui-rails:3
 dev-ruby/listen:2
 dev-ruby/prawn:0
-dev-ruby/sass-rails:4.0
 dev-ruby/sprockets:2.2
 dev-ruby/sprockets:2.11
 dev-ruby/sprockets-rails:2.0
@@ -200,11 +204,6 @@ app-emulation/crossover-office-pro-bin
 # Masked, committed accidentally. It's not tested yet, possibly broken.
 =net-im/ejabberd-17.01
 
-# Hans de Graaff <graaff@gentoo.org> (2 Apr 2017)
-# Mask vulnerable slot for security bug. Bug #611384.
-# Removal in 30 days.
-dev-ruby/rubyzip:0
-
 # Yixun Lan <dlan@gentoo.org> (30 Mar 2017)
 # Masked, broken due to emoji support which requre npm package installed (bug #612218)
 =app-i18n/ibus-1.5.15
@@ -226,11 +225,6 @@ dev-python/edpwd
 # Symantec trust issues properly (bug #613714)
 =app-misc/ca-certificates-20161130.3.30-r1
 
-# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (20 Mar 2017)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-59
-
 # Kent Fredric <kentnl@gentoo.org> (18 Mar 2017)
 # ExtUtils::MakeMaker 7.18+ Block
 # Masked until strictly needed to avoid accidental conflicts later
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d9293b534c75..26cff3feda9d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1292,6 +1292,7 @@ dev-db/firebird:xinetd - Install ClassicServer
 dev-db/haildb:debug - Enable extra debug codepaths and assertions. If disabled, both the debug code and assertions are removed from the resulting binaries. Optimisations are untouched.
 dev-db/haildb:zlib - Add support for compressed tables through sys-libs/zlib.
 dev-db/maatkit:udf - Build the MySQL UDFs shipped with maatkit, requires non-minimal MySQL
+dev-db/mariadb:backup - Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption
 dev-db/mariadb:cluster - Add support for NDB clustering (deprecated)
 dev-db/mariadb:community - Enables the community features from upstream.
 dev-db/mariadb:embedded - Build embedded server (libmysqld)
@@ -2494,7 +2495,6 @@ dev-python/pygame:midi - Enable midi support using media-libs/portmidi
 dev-python/pygpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-python/pygpu:opencl - Enable OpenCL support
 dev-python/pyhamcrest:numpy - Enable optional dependence on dev-python/numpy
-dev-python/pymongo:mod_wsgi - Disable the C extension to work with mod_wsgi.
 dev-python/pyocr:cuneiform - Enable support for the app-text/cuneiform OCR engine
 dev-python/pyocr:tesseract - Enable support for the app-text/tesseract OCR engine
 dev-python/pypax:ptpax - Enable PT_PAX_FLAGS support.
@@ -3632,10 +3632,13 @@ mail-client/sylpheed:oniguruma - Use dev-libs/oniguruma for regular expression
 mail-client/thunderbird:bindist - Disable official Thunderbird branding (icons, name) which are not binary-redistributable according to upstream.
 mail-client/thunderbird:crypt - Enable encryption support with enigmail
 mail-client/thunderbird:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
+mail-client/thunderbird:gtk2 - Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3
+mail-client/thunderbird:jemalloc - Enable or disable jemalloc
 mail-client/thunderbird:jemalloc3 - Enable or disable jemalloc3 (forced-on when supported prior to 38.0)
 mail-client/thunderbird:lightning - Enable app-global calendar support (note 38.0 and above bundles calendar support when this flag is off)
 mail-client/thunderbird:minimal - Remove the software development kit and headers
 mail-client/thunderbird:mozdom - Enable Mozilla's DOM inspector
+mail-client/thunderbird:rust - Enable support for using rust compiler (experimental)
 mail-client/thunderbird:system-cairo - Use the system-wide x11-libs/cairo instead of bundled.
 mail-client/thunderbird:system-harfbuzz - Use the system-wide media-libs/harfbuzz and media-gfx/graphite2 instead of bundled.
 mail-client/thunderbird:system-icu - Use the system-wide dev-libs/icu instead of bundled.
@@ -6199,7 +6202,9 @@ net-misc/chrony:pps - Support for the Linux Pulse Per Second (PPS) interface
 net-misc/chrony:refclock - Support for reference clocks
 net-misc/chrony:rtc - Support for the Linux Real Time Clock interface
 net-misc/connman:ethernet - Enable ethernet support.
+net-misc/connman:iptables - Use net-firewall/iptables as firewall.
 net-misc/connman:l2tp - Use net-dialup/xl2tpd for L2TP VPN support.
+net-misc/connman:nftables - Use net-firewall/nftables as firewall.
 net-misc/connman:ofono - Use net-misc/ofono for telephony support.
 net-misc/connman:openconnect - Use net-vpn/openconnect for VPN support.
 net-misc/connman:openvpn - Use net-vpn/openvpn for openvpn support.
@@ -7929,6 +7934,7 @@ sys-fs/udev:gudev - Build the gobject interface library
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
 sys-fs/udisks:cryptsetup - Enable sys-fs/cryptsetup support
 sys-fs/udisks:gptfdisk - Pull in sys-apps/gptfdisk for sgdisk command as used by partitioning functionality
+sys-fs/udisks:lvm - Add support for Logical Volume Management via sys-fs/lvm2.
 sys-fs/udisks:remote-access - Control whether connections from other clients over LAN are allowed
 sys-fs/udisks:systemd - Support sys-apps/systemd's logind
 sys-fs/zfs:kernel-builtin - Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 850235a998a8..078463d7abfa 100644
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 RESTRICT="test"
diff --git a/sys-apps/hdparm/hdparm-9.51.ebuild b/sys-apps/hdparm/hdparm-9.51.ebuild
index 974af72c31e2..e5c5268c21c6 100644
--- a/sys-apps/hdparm/hdparm-9.51.ebuild
+++ b/sys-apps/hdparm/hdparm-9.51.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 48b04817df1d..cf624b5762b4 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,3 +1,3 @@
-DIST man-pages-4.09.tar.xz 1521560 SHA256 a574a08e4a62a24dc639cb4ee3e7aa68e7cd8ef2c14a5d54b90d09ac137e809c SHA512 695f90b9f4721d041de0441e240afce88e49f4ea5ffea855262da3cdd0f3f2b6401f2728786da3afa2245aef84d41c0c449415e7e78e408b69c9214ddb4c74ad WHIRLPOOL 6b937d95cbefddf94658a54ec8cc820f7a970830ecc0857cc36577946586084a13fadc7cbcf48c5eddc31b6cc9b2f3b08509b33b1b96e023f0e07927d8c9ec97
 DIST man-pages-4.10.tar.xz 1556948 SHA256 7395dfc391d545385a998d23df9accb60f2020451c53940eaf8a07b6ea8a63fa SHA512 6c5b8e1339a02054a5346ca3ff665c414ef178e69fe0d064d4ad7dc372ba364df2753bf605a682cc366c12661c42b9fd17567c72a0f24173f9b086d79cf354d4 WHIRLPOOL d15515e5525797bb40b9d640ad130e82998d2a07e8464231ad422f5b2e38228c60616223cdb8bbb208edef6eed509374efe10db8ec414ca7157168836a1bbc0a
+DIST man-pages-4.11.tar.xz 1574380 SHA256 adde80495f5efb26d077f4e5309bafdc4859e080b7529263720f7cb5f403f524 SHA512 cc1282467255d5c078b099ab6dbc407c5f56fa66fb3f5789286bc66c98b229cae88bf8afdafa7c9609a37c87cdb1401bb381cec25c64690ab69faf4d00787187 WHIRLPOOL 31fb2e76223861fe03d2c00a25d161716c0b603dff41731ee8665856ecc6625e8b5d568e17e40453ac12ca7ee1ac9b68b01a5394c4c61b0f2b104280d4cd1b23
 DIST man-pages-gentoo-2.tar.bz2 5141 SHA256 b7d9423c2069e587deb7671273d4a1ffed7d31b9f95a689b128a759d636762f0 SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 WHIRLPOOL dcacb319a54ccd2a965786c816684de286581dee6f7b3f8ba4c97cc368e2e50abc92aad403dbdb7b0c15764accb06cd562046bcf14229ad12be242bb2bc7f651
diff --git a/sys-apps/man-pages/man-pages-4.10.ebuild b/sys-apps/man-pages/man-pages-4.10.ebuild
index ddfd9b5a5b60..996869e4a1ff 100644
--- a/sys-apps/man-pages/man-pages-4.10.ebuild
+++ b/sys-apps/man-pages/man-pages-4.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-4.09.ebuild b/sys-apps/man-pages/man-pages-4.11.ebuild
similarity index 89%
rename from sys-apps/man-pages/man-pages-4.09.ebuild
rename to sys-apps/man-pages/man-pages-4.11.ebuild
index 02403e5770ee..ddfd9b5a5b60 100644
--- a/sys-apps/man-pages/man-pages-4.09.ebuild
+++ b/sys-apps/man-pages/man-pages-4.11.ebuild
@@ -14,13 +14,14 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
-# Block packages that used to install colliding man pages #341953 #548900
+# Block packages that used to install colliding man pages #341953 #548900 #612640
 RDEPEND="virtual/man
+	!<sys-apps/keyutils-1.5.9-r3
 	!<sys-apps/attr-2.4.47-r2
 	!<dev-libs/libaio-0.3.109-r2"
 PDEPEND="nls? (
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 8b258f2c46fa..69ca4c763885 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,2 +1,3 @@
 DIST usbredir-0.7.1.tar.bz2 329895 SHA256 407e9e27a1369f01264d5501ffbe88935ddd7d5de675f5835db05dc9c9ac56f3 SHA512 f8d26d59d5a530aa413fabe2402fbbd9662760453c2b4e83d34f2e5287c188114ea870f15ae1bc910297649986315be965f0d23d0a2b7b0cec2f207fc65d7598 WHIRLPOOL 8f85e7174e068fa1cffaa48e079d2348171fcc7907870eda3a5bef25c83dc6be5a468d19b84aee044fbc638fa8362aa63e98b372703065d3de3b4758ce20a310
+DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 SHA256 45b671997872170ccbdd111fd81d880a39f440fa2a997a22c6d2cf6f3f78c445 SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7 WHIRLPOOL 9741309fdf10881708b964beecc10c08d0ed7073e4c2299a79b5a100c3c5cdf75ef3c87c68cc4d8f1e3d94d79e5fab5dcc63a983658e04fca53b5f625453ae08
 DIST usbredir-0.7.tar.bz2 317216 SHA256 0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa SHA512 f615fc52f195c7159d16b551f6ecd9426f2aad64222f24b964fbd66fbf59498d80d4d5cf851cc1be9ddd27a9d962afa05970e1379f1ef02e8ac304235e82ad4a WHIRLPOOL 3f7ad0bcde1a109fcc9b32c23019d6078a1ea1c8d72998ce2d3b0c42278a953cfb739c74f21b5083c4e3da8f558ad0e60a82db540c3e1da1a89fd52d9208ff2b
diff --git a/sys-apps/usbredir/usbredir-0.7.1.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
similarity index 55%
rename from sys-apps/usbredir/usbredir-0.7.1.ebuild
rename to sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
index 2df46a4d9a60..1a53fb75aff4 100644
--- a/sys-apps/usbredir/usbredir-0.7.1.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
@@ -1,22 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic
 
-DESCRIPTION="A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)"
+MY_PV=${PV/_p*/}
+
+DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="http://spice-space.org/page/UsbRedir"
-SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.bz2"
+SRC_URI="http://spice-space.org/download/${PN}/${PN}-${MY_PV}.tar.bz2
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/libusb-1.0.19"
+RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${S}_p20170503-patches"
+)
+
 DOCS="ChangeLog README* TODO *.txt"
 
 src_configure() {
@@ -31,5 +40,5 @@ src_install() {
 	prune_libtool_files
 
 	# noinst_PROGRAMS
-	dobin usbredirtestclient/.libs/usbredirtestclient
+	dobin usbredirtestclient/usbredirtestclient
 }
diff --git a/sys-apps/usbredir/usbredir-0.7.ebuild b/sys-apps/usbredir/usbredir-0.7.ebuild
index 84a69d774d90..eb4e001c618a 100644
--- a/sys-apps/usbredir/usbredir-0.7.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic
 
-DESCRIPTION="A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)"
+DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="http://spice-space.org/page/UsbRedir"
 SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.bz2"
 
diff --git a/sys-apps/usbredir/usbredir-9999.ebuild b/sys-apps/usbredir/usbredir-9999.ebuild
index e2f4dc015ed3..bacd7a0726dc 100644
--- a/sys-apps/usbredir/usbredir-9999.ebuild
+++ b/sys-apps/usbredir/usbredir-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic autotools git-2
+inherit eutils flag-o-matic autotools git-r3
 
-DESCRIPTION="A simple TCP daemon and set of libraries for the usbredir protocol (redirecting USB traffic)"
+DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="http://spice-space.org/page/UsbRedir"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/usbredir.git"
 
@@ -20,11 +20,15 @@ DEPEND="${RDEPEND}
 
 DOCS="ChangeLog README* TODO *.txt"
 
-EGIT_BOOTSTRAP="eautoreconf"
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
 	append-cflags -Wno-error
+
 	econf $(use_enable static-libs static)
 }
 
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d35c30defb35..72b70fc3954c 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	python-single-r1 multilib-minimal systemd
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 2eec6c91cc94..96caf5070a69 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -2,3 +2,4 @@ DIST hpx-0.9.9.tar.gz 3461235 SHA256 cb17ac303f49795300c6b803725036aa09b434a7a23
 DIST hpx_0.9.10.tar.gz 3016064 SHA256 af84455003bbf49fd81477138e6c7e699b7c24a4933de04d709c1437a9ad6aad SHA512 4c5ce7014d781c47415818898b99e5379e1547dd5f54fdefc9202de149ca4a0e3bf13c863cdea9ef70f7e3eb2c808cfda35d723a7f681745b8514a1887cbbb75 WHIRLPOOL 2fbc2c32532eb8141e6eb86a8e99ed4a7d4a6bb87bff9b383c4e4b5b0628fb5d6975672eaf5423f87b13f2f1d07e039362450b0276fa120f5a5abc8d7077408c
 DIST hpx_0.9.8.7z 2089649 SHA256 9e04685b07e4155e6d3e00c944e5fe91c0c815a2b3bc7bc345eb59d8708bac91 SHA512 1789582ee776173d4aa67b512d2df225c734b98ffe59a8f1eee38b5112ac7c02e0c7c478f72062e5b6a5d5053ce1848729c374093378f63200acf51a208fb3c7 WHIRLPOOL b4b5a8a83aa4d07466ee0570b9fdadd906281e626eed2ce82e3a8e03681de1591a46af2254cbd387eb2d0bfac22c6796537fbbb37764be7dd424b97dd0d433c7
 DIST hpx_0.9.99.tar.gz 3779841 SHA256 072e8ed614eb81353ed3b4628835349fb08b42515f2f8d62855921354c1ae92b SHA512 57c03c01c4a9f770e56a60645ec352338365fe05c544b18ff2e944044284315a7e76bbdc2c7193fe55e6992dcb51a51d1042372fdd141b572bd8e18bf1afc363 WHIRLPOOL 1d2241c23ef43cf3cbc68fe59c5122165aff1793f2c36928badeb8e24a6bb8f3c35cef17a04672b308905e43d5a2c87cc252f0727c9b92079420da182904e301
+DIST hpx_1.0.0.tar.gz 3972403 SHA256 b47ab61da393eeb38c5d201e08a9ecb56a4a18d660a8605f0f5ebfeac2dcb069 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d WHIRLPOOL b72ced95a656749d116fb6b9faf181a7dc396857012b78b13d9a80e2a1e96f63a2e334fe2be359cfa86c7725e3572f4410c4ef5b16c57cb4bb881fcc973b4036
diff --git a/sys-cluster/hpx/hpx-1.0.0.ebuild b/sys-cluster/hpx/hpx-1.0.0.ebuild
new file mode 100644
index 000000000000..5d6c92ba0af5
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+if [ ${PV} == 9999 ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
+else
+	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}_${PV}"
+fi
+
+inherit cmake-utils fortran-2 multilib python-single-r1
+
+DESCRIPTION="C++ runtime system for parallel and distributed applications"
+HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="doc examples jemalloc papi +perftools tbb test"
+
+RDEPEND="
+	tbb? ( dev-cpp/tbb )
+	>=dev-libs/boost-1.49
+	papi? ( dev-libs/papi )
+	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	>=sys-apps/hwloc-1.8
+	>=sys-libs/libunwind-1
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
+"
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+	jemalloc? ( !perftools !tbb )
+	perftools? ( !jemalloc !tbb )
+	tbb? ( !jemalloc !perftools )
+	"
+
+pkg_setup() {
+	use test && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DHPX_BUILD_EXAMPLES=OFF
+		-DHPX_MALLOC=system
+		-DLIB=$(get_libdir)
+		-Dcmake_dir=cmake
+		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
+		-DHPX_JEMALLOC=$(usex jemalloc)
+		-DBUILD_TESTING=$(usex test)
+		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
+		-DHPX_PAPI=$(usex papi)
+	)
+
+	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
+	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
+	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# avoid over-suscribing
+	cmake-utils_src_make -j1 tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index 6bcda9040dd4..d6e19cd51a49 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -47,16 +47,17 @@ src_install() {
 	[[ -f ${ED}usr/bin/parity.gnu.gcc.exe ]] && exeext=.exe
 
 	# create cross compiler syms, also for former versioned winnt profiles
-	local v
+	local v t
 	for v in "" 5.2 6.1; do
-		dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt${v}-gcc
 		dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt${v}-c++
 		dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt${v}-g++
-		dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt${v}-ld
-		dosym /usr/bin/parity.gnu.windres${exeext} /usr/bin/i586-pc-winnt${v}-windres
-		dosym /usr/bin/parity.gnu.ar /usr/bin/i586-pc-winnt${v}-ar
-		dosym /usr/bin/parity.gnu.ranlib /usr/bin/i586-pc-winnt${v}-ranlib
-		dosym /usr/bin/parity.gnu.strip /usr/bin/i586-pc-winnt${v}-strip
+		for t in gcc ld windres ar nm ranlib strip; do
+			if [[ -e "${ED}"usr/bin/parity.gnu.${t}${exeext} ]]; then
+				dosym /usr/bin/parity.gnu.${t}${exeext} /usr/bin/i586-pc-winnt${v}-${t}
+			else
+				dosym /usr/bin/parity.gnu.${t} /usr/bin/i586-pc-winnt${v}-${t}
+			fi
+		done
 	done
 
 	# we don't need the header files installed by parity... private
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index d46b9d6b1d79..146af7a7ba0f 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -1,9 +1,5 @@
 DIST bios.bin-1.10.1.xz 63668 SHA256 39d39cfa8166d947439081dedebb8c79a159de9b8b5447afb4876416fcf17d9d SHA512 9e3ba9c7dac3f03f9c57898a993eab34f8f3fecb0ac4718f6d4d6b1a825651a255e48fb7dc29a339249f42668469946f238674cb1f8308cf9b4a3e1e82c346d3 WHIRLPOOL 1208730ef4ee8455fe1e051b3350463d458ccf734c0fdd12d06b91dd0edbb96b2e6ec7bcc5b37902a98465c73bbf327fc3c42b7f1587bae1871d4ab9a70f5e50
-DIST bios.bin-1.7.5.gz 78943 SHA256 2e83e68e6cff73ede1c2490dabad74c177d7b67f9d93a5ed5f2ef39e76dea0ea SHA512 153a4cf190843540a9a72fcb0cf34f1f9f6ff2efb4b4f700c515dea467b101a8999421b53c2f21599864e2e803ae455a4ae39c7e8be9491c4383b4bfbe734014 WHIRLPOOL 2383f5f3a91581b0ee0ff19fd429a67b7fe09db05c456b98aee01ab9008a12d265e56f81b4d60224c7be15a86da9d2288f83a1d83f621b2ff00ab3aaccb277a4
-DIST bios.bin-1.8.2.xz 67428 SHA256 b4628fdbfc39fd73e7ab0c54dfc26128b6011d34778e381c1b2d2340209be838 SHA512 2b2339c02134bcbd6e71e8d31f9907a160534a047bc91502c215d3d4c79431b962177ac43d826cc5689d71dfc0995bc8a9a5caf1a35929f308b3c2bdad720c15 WHIRLPOOL 050a7880d0da8bb8be1ce3e1262f7e5107a5a426eb31ce9629ef497305e390d348de7ed3c7595248010eb02481a2b4a9e4dca94b3a9c954c18b8a9624f46bbc6
 DIST seabios-1.10.1.tar.gz 588092 SHA256 5063ddbac61ec4e61a12daa83931c37e5629b1c18502f7c00ed4e696c2a1d2cb SHA512 b2f1c2b15853b1cc949f741ae13f32fd133efb0d0917e1cdfb253f9cd0bc9bb0b42c592cdd87bc74ccbb12a4301c102ae723ccdb490ea4716e0c9dca3dd3fead WHIRLPOOL 723d4835288566bbb6a3c3b7df2486c0a7f949590404230667a4e4490317591bcdb99dd9b0933770d8c1416c25f6a8d20b153d7410787e19d8ecbd92a7312af9
-DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
-DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
-DIST seabios_1.7.5-1_all.deb 112098 SHA256 61bab13a733e8087147ae4798f0053c6d632866e332a1ee3af2265e4f57ced36 SHA512 891a26e084ccac8e9badce5a58eeadfb958af9d5ed087a99998f92153718e8231c14abfae0ed86bde870aa9e2f29fd93d5cc04515695e6f2d7b9fcaaef11bfce WHIRLPOOL d47ad79e7bd701862d059d86c7cb3b730b0303c5170ec52a481df5326cad0cd98ea78fcdb2730623b6b65289d9042f4685991eb515402543083cd8228f849959
-DIST seavgabios-1.8.2.tar.xz 20284 SHA256 d28ff071ee56f7bd88cec2482908f469d553cd8b61485a8e89989c26cb5c0e4a SHA512 16d2b54cd98aa22f7af21d8c51a4cf87d9462ec0c99bf703bf7f6c3c4e0be4cbd313b8cf0fb79cdb7b6a7f94441493a4f9669b6d44297e12f03a749befa2d845 WHIRLPOOL 9d61957ec4e3a0c5e4b999495119c6cfb4f2165d98b652b530dbee3ceb19b18a75d07902a5ee15b41b877154bb9ac19163d75c6024a40c4e94e6cf5cdf561e9d
+DIST seabios-1.10.2-bin.tar.xz 121172 SHA256 d32e349fcd865d447856be7d7034f47f1e1d11b413d4158f747d68d03175792b SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69 WHIRLPOOL 17eaa7ecd4a126e4b021728ab5136d4a918e1ba413a8c56416eeb7202c9d5b1c3439ef2c528e8be3f863b3a218bcb2ffded0b1a037eee0eaf1fc52cb04f228c8
+DIST seabios-1.10.2.tar.gz 589283 SHA256 89c70b70fa7ab179694efb95c2c89d4f50a39381321cbed5d8302cb9b25e953d SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc WHIRLPOOL 1df63d9b5940d8e1b099f75ff090505088104dc0d599ba9403c5ceb2caabf0f92023ae5bebe06ee5ad95d44e22ae540b0c9d9000fa7859801044ccd999d6efce
 DIST seavgabios-bin-1.10.1.tar.xz 20408 SHA256 88c310f2f1ddbbca3e00f8895706b3df718046bd729ab719c4e4bd01f502bd6d SHA512 7fe97efaf61c2d1e72c8df27b5108c80f6a51f5a7370de68720b0f71abe05ae5765dd867d127df2fa6182b5d4702a9ef7549e7170fec5071b31a6066db20c219 WHIRLPOOL 484c2f0302bf232e8065ec8cc1566731a962a2f76e01df2b7b21611b3c3ab47b04f1de192a3675130942a42c97f78e210d14ac2e36a7c36d8c28eff4e1618abc
diff --git a/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch b/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
deleted file mode 100644
index d9431f994e0b..000000000000
--- a/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/559980
-
-From e4d2b8ce5db86bd56efdaf64b974925bd7a7b249 Mon Sep 17 00:00:00 2001
-From: Magnus Granberg <zorry@gentoo.org>
-Date: Fri, 11 Sep 2015 17:38:40 -0400
-Subject: [PATCH] build: use -fstack-check=no when available
-
-Some compilers (such as the one in hardened/Gentoo) default this
-option to on which leads to build failures:
-src/stacks.c: In function 'call16_back':
-src/stacks.c:139:5: error: 'asm' operand has impossible constraints
-     asm volatile(
-     ^
-
-URL: https://bugs.gentoo.org/559980
-Reported-by: Alon Bar-Lev <alonbl@gentoo.org>
-Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index e287530..3a0d2e8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,6 +63,7 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \
- COMMONCFLAGS += $(call cc-option,$(CC),-nopie,)
- COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
-+COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
- COMMA := ,
- 
- CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0
--- 
-2.5.1
-
diff --git a/sys-firmware/seabios/files/seabios/README b/sys-firmware/seabios/files/seabios/README
new file mode 100644
index 000000000000..7030949c1810
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/README
@@ -0,0 +1 @@
+The config.vga-xxx files come from the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/files/seabios/config.seabios-128k b/sys-firmware/seabios/files/seabios/config.seabios-128k
new file mode 100644
index 000000000000..93203af0ded7
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/config.seabios-128k
@@ -0,0 +1,12 @@
+# for qemu machine types 1.7 + older
+# need to turn off features (xhci,uas) to make it fit into 128k
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=128
+CONFIG_BOOTSPLASH=n
+CONFIG_XEN=n
+CONFIG_USB_OHCI=n
+CONFIG_USB_XHCI=n
+CONFIG_USB_UAS=n
+CONFIG_SDCARD=n
+CONFIG_TCGBIOS=n
+CONFIG_MPT_SCSI=n
diff --git a/sys-firmware/seabios/files/seabios/config.seabios-256k b/sys-firmware/seabios/files/seabios/config.seabios-256k
new file mode 100644
index 000000000000..65e5015c2f14
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/config.seabios-256k
@@ -0,0 +1,3 @@
+# for qemu machine types 2.0 + newer
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=256
diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.10.2.ebuild
similarity index 74%
rename from sys-firmware/seabios/seabios-1.8.2.ebuild
rename to sys-firmware/seabios/seabios-1.10.2.ebuild
index b015d787e8d3..ad50dcd7ec5e 100644
--- a/sys-firmware/seabios/seabios-1.8.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.10.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 
@@ -12,18 +12,19 @@ inherit eutils toolchain-funcs python-any-r1
 # git clone git://git.seabios.org/seabios.git && cd seabios
 # git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
 
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-2
+	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
-	# https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
-	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? (
-			mirror://gentoo/bios.bin-${PV}.xz
-			seavgabios? ( mirror://gentoo/seavgabios-${PV}.tar.xz )
-		)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
+	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
+	SRC_URI="
+		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
@@ -71,13 +72,6 @@ src_unpack() {
 	mkdir -p "${S}"
 }
 
-src_prepare() {
-	use binary && return
-
-	epatch "${FILESDIR}"/${P}-fstack-check.patch #559980
-	epatch_user
-}
-
 src_configure() {
 	use binary && return
 
@@ -106,8 +100,12 @@ _emake() {
 src_compile() {
 	use binary && return
 
-	_emake out/bios.bin
-	mv out/bios.bin ../bios.bin
+	for t in 128k 256k ; do
+		cp "${FILESDIR}/seabios/config.seabios-${t}" .config || die
+		_emake oldnoconfig
+		_emake out/bios.bin
+		mv out/bios.bin ../bios-${t}.bin || die
+	done
 
 	if use seavgabios ; then
 		local config t targets=(
@@ -129,8 +127,11 @@ src_compile() {
 }
 
 src_install() {
+
 	insinto /usr/share/seabios
-	newins ../bios.bin* bios.bin
+	use binary && doins ../bios.bin
+	use !binary && newins ../bios-128k.bin bios.bin
+	doins ../bios-256k.bin
 
 	if use seavgabios ; then
 		insinto /usr/share/seavgabios
diff --git a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild b/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
deleted file mode 100644
index 941a02fe6e5c..000000000000
--- a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-#BACKPORTS=1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? (
-			https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
-			seavgabios? (
-				mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1_all.deb
-			)
-		)
-		${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary +seavgabios"
-
-REQUIRED_USE="ppc? ( binary )
-	ppc64? ( binary )"
-
-DEPEND="
-	!binary? (
-		>=sys-power/iasl-20060912
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	if use binary && use seavgabios ; then
-		unpack ./data.tar.xz
-		mv usr/share/seabios/vgabios*.bin ./ || die
-	fi
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	use binary && return
-
-	if [[ -z "${EGIT_COMMIT}" ]]; then
-		sed -e "s/VERSION=.*/VERSION=${PV}/" \
-			-i Makefile || die
-	else
-		sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
-			-i Makefile || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	use binary || tc-ld-disable-gold #438058
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	_emake out/bios.bin
-	mv out/bios.bin ../bios.bin
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	newins ../bios.bin* bios.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.7.5.ebuild b/sys-firmware/seabios/seabios-1.7.5.ebuild
deleted file mode 100644
index 7fb717bed20e..000000000000
--- a/sys-firmware/seabios/seabios-1.7.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-#BACKPORTS=1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-2
-else
-	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz )
-		${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary"
-
-REQUIRED_USE="ppc? ( binary )
-	ppc64? ( binary )"
-
-DEPEND="
-	!binary? (
-		>=sys-power/iasl-20060912
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	use binary && return
-
-	if [[ -z "${EGIT_COMMIT}" ]]; then
-		sed -e "s/VERSION=.*/VERSION=${PV}/" \
-			-i Makefile || die
-	else
-		sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
-			-i Makefile || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	use binary || tc-ld-disable-gold #438058
-}
-
-src_compile() {
-	if ! use binary ; then
-		LANG=C emake \
-			CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" \
-			AR="$(tc-getAR)" \
-			OBJCOPY="$(tc-getOBJCOPY)" \
-			RANLIB="$(tc-getRANLIB)" \
-			OBJDUMP="$(tc-getOBJDUMP)" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			out/bios.bin
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	if ! use binary ; then
-		doins out/bios.bin
-	else
-		newins ../bios.bin-${PV} bios.bin
-	fi
-}
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index dac92b48dfb1..9b6d098427b4 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,3 @@
 DIST cryptsetup-1.7.2.tar.xz 1222688 SHA256 dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342 SHA512 ff761bd0c5e9a7941fd27d55839804f2ce96145a45a9689d234954fc43c6172c913c59c83b37ef6cc5459ccecff63212c369077fdea70c14326372076eae7f86 WHIRLPOOL b78d91b449ea7ba325f05dc00b2005e8f6def91703cd982900682bc965eec0992a0cc21c4f44335c03dda885d4505bcf26d1bf58f991c9f60096927bcf582963
-DIST cryptsetup-1.7.3.tar.xz 1228432 SHA256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 SHA512 616bac2ce272b8e9d1de6b71ba23f6260dfdb17e3969ff4950c3221fc9fa1b9a0a1081327d2806868045395a407452a8c8bcf4ce0faaf2bd2d51a7c9f844a767 WHIRLPOOL 82a70877abbe674cca9f97585cd54535a60191a019028907a7a7187964260f754020dc1351de48480944cb3701cb8d83a543d8ffd7c2594342d1e244d4026e3d
 DIST cryptsetup-1.7.4.tar.xz 1232068 SHA256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 WHIRLPOOL f00d0e529a5d34460733e8110584266b42011055d81d94b0ae8d47a1f11f1639c4b658a55415241e72c431c615d896a94ae444a518a0b56f971b888a5ab7cc09
+DIST cryptsetup-1.7.5.tar.xz 1232696 SHA256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 WHIRLPOOL cd2fe15a08f3202c89055e334a3c56fcb60a19bda8135c7d833f384e9beb7fcd6f31fbbd4ac29572f46199f05bd6055b89b3d6733828354d9c985b3e55da4e14
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
index 531ebe573224..9341638132d2 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
similarity index 96%
rename from sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild
rename to sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
index 9182d5a5ffa1..503731c56b59 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit autotools distutils-r1 linux-info libtool eutils versionator
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+#PATCHES=( )
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
@@ -58,7 +58,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch "${PATCHES[@]}"
+	#epatch "${PATCHES[@]}"
 	epatch_user && eautoreconf
 
 	if use python ; then
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch b/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch
deleted file mode 100644
index a7a708f427a3..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-1.7.3-libressl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cryptsetup-1.7.3.orig/lib/crypto_backend/crypto_openssl.c cryptsetup-1.7.3/lib/crypto_backend/crypto_openssl.c
---- cryptsetup-1.7.3.orig/lib/crypto_backend/crypto_openssl.c	2016-10-28 01:58:10.000000000 -0700
-+++ cryptsetup-1.7.3/lib/crypto_backend/crypto_openssl.c	2016-11-02 13:38:46.094483756 -0700
-@@ -73,7 +73,7 @@
- /*
-  * Compatible wrappers for OpenSSL < 1.1.0
-  */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static EVP_MD_CTX *EVP_MD_CTX_new(void)
- {
- 	EVP_MD_CTX *md = malloc(sizeof(*md));
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index f5c49c2b90e0..8eeb7e090006 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,2 +1,3 @@
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64
+DIST udisks-2.6.4.tar.gz 1242262 SHA256 7c7889dbd8f910b8a8094841168c04d48e0bdaf946b22aa5f0742a460473c191 SHA512 8cd4fa1c2873f2150448bb81268feb38802959bb860fa41f9cc4f088327faf207011a3ea15c121f531dc0a8cd65a3fff14615b79bdaa5f59f52f4ede4d44532c WHIRLPOOL cc54fe2ca683d9adc61448a48e1a9be43c1bbc5b4c1902f8ea2fbf7561e8f798edca6e7e6cfce55ad6b902ffb40045d2ae2ec49784dd88fa9f680b69e021aa1c
diff --git a/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
new file mode 100644
index 000000000000..8564e2b83342
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
@@ -0,0 +1,22 @@
+From 283e9093d541b8de0ecca324fde8fd38b560dc8e Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 24 Apr 2017 09:14:05 +0200
+Subject: [PATCH] Fix typo in data/Makefile.am
+
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index af0cce2..83af330 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -6,7 +6,7 @@ dbusservice_in_files = org.freedesktop.UDisks2.service.in
+ dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
+ 
+ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
+-	@sed -e "s|\@udisksprivdir\@|$(libexecdir)/udisks2|" $< > $@
++	@sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@
+ 
+ dbusconfdir = $(sysconfdir)/dbus-1/system.d
+ dbusconf_in_files = org.freedesktop.UDisks2.conf.in
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b9596e187b94..4b0d5ddb8c16 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -7,6 +7,7 @@
 	<use>
 		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
 		<flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
 		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 	</use>
diff --git a/sys-fs/udisks/udisks-2.6.4.ebuild b/sys-fs/udisks/udisks-2.6.4.ebuild
new file mode 100644
index 000000000000..7354cdfb738c
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.6.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acl cryptsetup debug +gptfdisk +introspection lvm nls selinux systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libatasmart-0.19
+	>=sys-auth/polkit-0.110
+	>=virtual/libgudev-165:=
+	virtual/udev
+	acl? ( virtual/acl )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	>=sys-block/parted-3
+	virtual/eject
+	cryptsetup? (
+		sys-fs/cryptsetup[udev(+)]
+		sys-fs/lvm2[udev(+)]
+	)
+	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-1.3
+	gnome-base/gnome-common:3
+	>=sys-kernel/linux-headers-3.1
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-udisksdprivdir.patch"
+)
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	default
+
+	eautoreconf
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 6a286b73104b..b2b65cf685d7 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -74,6 +74,9 @@ DIST genpatches-4.10-13.extras.tar.xz 17340 SHA256 89ecdd76d177c1d667b803d33f502
 DIST genpatches-4.10-14.base.tar.xz 280688 SHA256 47a11244c2aa812a2b9d05b5069905e953a061c736ccd8460aa24ea8fef69d5f SHA512 7cf7069c7df3cad7aebdac22cb00d2d566d1eb0c503e2fe39b7ed972abf6a2083bdd18442f0d4c99f28b2cdaf48c58b0f71751533629338d7128f31dd5663b74 WHIRLPOOL 229569dcb0532c51207cfd2e86f2ff66539ddf7ae89f0eb933f53fdaa33ebdb68da8b04a28fe95743e6f6aaf4244c51034ae162d2ad53293f6b4f4493b981f06
 DIST genpatches-4.10-14.experimental.tar.xz 105388 SHA256 20512ae33f788ade4b2ccf2fe55e90c57ea070036259274a84e60bfe5cbae9cd SHA512 1a5d1de8ee74a68dd8a20fe640b6342154d8b2e4354d25648a16fd4dc35de648958891fc2ca959bf3045f6eaf1197b4d0b7c7e45561881d312d018cb171bda60 WHIRLPOOL ddc8c8839705463fa826cc1bb82a378940351275d4f7eabedb2a81793564a4ce8aa8379bff9c1459e91fde23f9ef4a4c58ae795cd245bb1994e0558155d711cb
 DIST genpatches-4.10-14.extras.tar.xz 17348 SHA256 a5a81409396a9e811bcc1e6056eea181207e37adfb8cd1aaa85499810f3c1db1 SHA512 890eed4fd6bdf822320b92219c03712903269c5f454e341b2cfc048482c0856ef1aee832f3ba369bd99c91bf7050ebea37a51b75b867644a7e3b9c1dc3530f66 WHIRLPOOL 38e8783dc65c77ece12d9ea3e18f3902c198ab587c3c949a9f36488267c7f1bda779d8794ba7238104253040d9654f828ad451eccffed9f5fb15642ea0dbd90a
+DIST genpatches-4.10-15.base.tar.xz 297072 SHA256 ed5febe4ddebc77b702e6377fff621a9280913ea480f78fbff74bcb50ee0f282 SHA512 689194e08fae6a7bc777bee7989064f4efb37ea340476e09fa7fd629ac45c0d5d7a2637ed95eb92b8bde0a45727b610288e573388024ee15b431a780fab33e7d WHIRLPOOL 61ff87ac1c41ff739e8ad081aa6afb3971c8963339046cab74570dcf4ba6a9a1774f182c2e7b07c050a25ae5d30f52cb4fa8954793b8c9797a2b663b85c9d85d
+DIST genpatches-4.10-15.experimental.tar.xz 105400 SHA256 1adebb8f9010a51de20ca8f7ad2b4acf67b91e3478689070201b9b01352c7754 SHA512 600a61a214ce6ec234072319635cdf619d8935226ae387c7f7c4c8a8965408a66c50575f0bba5f837705963469b4f1eed3407d0ecfbd67200c8664a3f86414b1 WHIRLPOOL 66c2123199a20a17323c78be6459aca1a8e680b093b81da07996f3ebd256e335a7a69723a4068fbf95bd6c71b8758df4fa9219ce9a78712c9973a30f32218b33
+DIST genpatches-4.10-15.extras.tar.xz 17344 SHA256 a8e82b18ec6263b107065e69b98de016476b89eedd2cb6b451975e5842aea715 SHA512 f5213b36ca334164db9262935b08a0635064bc22bba668e27336281a71be06039efc6ab3cd10c806dee474a44cfd87baac063db91574597942beb52b1cbc7b2e WHIRLPOOL b5b9483235869c003909d5c778838e0fa08be63d386816062db605d528c83bec69c3c1d7b555467500c756588ba2c61bd47ce882b17d9901f828551b8229c843
 DIST genpatches-4.10-8.base.tar.xz 177928 SHA256 d2a1baa7500946ad36849709bcc0430836fc9c050e0b85b094eb3de4f6a4a5e8 SHA512 38a0323484c88d1767962bb4327253e7aa47724f6f57e7fa94d559025c57bcceafaec4c5f6d13b1c2dc7e9cd80a917b8017d6cf1aac88c1212caf9cbd13cd7cd WHIRLPOOL c7503ceb8f870cf4fe2bf88f2ceb8b72b206c15d6e3d6fb8efe8198f8e8818eaf07a24e80969477f64b5ab9103f23bda1e152a3085f401305fe5f54520335356
 DIST genpatches-4.10-8.experimental.tar.xz 105420 SHA256 1018517fff821f903912e118a5490c9513da476892aa72dca01f650a8920e951 SHA512 1f498c23affa95d2ba77588d178c09c2181c24e35ebd57ccd18ae48db9155c56b19ab48c39dba7dc98530881a29b64233015cf4c290f2c23432611bee58d64d6 WHIRLPOOL ac48d4c8a18222e968e2e553569733a462f847331ad99cdffcd2d9e919a415dd0140adaa80ba98d75123bd3df2e6439466628973a650e7b82fba406664a8babb
 DIST genpatches-4.10-8.extras.tar.xz 17348 SHA256 3444b846c3232541152db3bb2d9ff5aa66c7c7249d346fd990ed304489e19d02 SHA512 a655184d0dfc4327a18b8e170bfad077818b7064d4c3b682c478835f297fac1d1f3cc3c611111f51275a9a5edabdfe7837954e7ab112b0480c60b1936a37b35e WHIRLPOOL 360df1ae85469913c9236147e2f5e4d38f1e109a35d4961a2cab271ef79049101680058c5a99430829de7e895ef5ca89e81a59dbf83deccb5d49daca4d1d5159
@@ -89,12 +92,18 @@ DIST genpatches-4.4-56.extras.tar.xz 16408 SHA256 74babcf456aed9c7c406a0feb37b5f
 DIST genpatches-4.4-68.base.tar.xz 1162372 SHA256 fe9483bd6c1d8fa3aaf23829e28ea4cd095285c6c0ac43f4540deec2d2932d94 SHA512 4e85931173378c53c90bba1f072c8126f188ab2b5d60fa91a41e85d053f3daac638175024d1864753dec4d65913601556f843c25ba63c22937e7f787925dae12 WHIRLPOOL 0a9375692ac429006651cfc19bedd36b9cd4f9e42a1556b484c1527694291b3a7acecfdc2d349259e05846c54b2bfe15dee5f479a696bca634490cb6b2111917
 DIST genpatches-4.4-68.experimental.tar.xz 87756 SHA256 6872d11824b0d7dded385904608f3cdd68836ba057ce60a4711b46d92a55622d SHA512 832ae03a3c7570af3304ece72c68ad54ad5aa28fc4de026eae55a1e4f84c2fa29496de84723e5b86812b90dc26d1c3ce662eebe62bb1ad9d22d9931857fc40de WHIRLPOOL 295810a2245401a701f5025c4ad46baf492c14b1eef32ad9b9da34bed0cf15b757f9e5b2ba81f4a1b688b921d9407e723784066b41f73eaac0c3440765639f59
 DIST genpatches-4.4-68.extras.tar.xz 16460 SHA256 0108bf1cee7d24d43a98f5fe24c542bf46da69434d891a177d1e3da1826d0340 SHA512 0e6421c413c00bb5b69994b090aaaffb0bd6eef02a0964faba79607920d7537e1304d6376de645a2be9dfbef4ea2f77e7feb4da47bfbaa5fae8c1a2cb340e9e6 WHIRLPOOL daade1be7ab935f432948eb9757d7d34695fc9f9056228a6b02051890378700b9f83ad905d7ceaed1ad0f0b9668f2af10f688588ddf3677c196eb84b6e46568e
+DIST genpatches-4.4-69.base.tar.xz 1171160 SHA256 532e39dc077d82f02f09d88f5f528fb56f65d75c280a7fa4a92d7e1e2ee75dc7 SHA512 8d2fac49e79a84364c6d4558a46974d6879f6f1a3931a74432cfa33939135bb83a4ef6f88d029db826ddb26187df0cea293a6ccfb41e7a914bdfb52313ff9816 WHIRLPOOL 4957d7d84153e1af9784cfc47e026c1b0860b28dcc2d7c2ac801b295ae38090a9f0922580c560de7169efed16825e076ba60fbc192ceb621ef92e0f7676ff7b6
+DIST genpatches-4.4-69.experimental.tar.xz 87792 SHA256 e95c6a1f36b562406905a887671779dbf2659f7e686ce20496ee78ea3cd8453c SHA512 c1baf83af627b74e9a53d414c9653dd9af7c0bc8f1a9be5ff162390ec6bec7f30bc0e1c8b9004a00e6e5cab3b97016595d68de8eeb0beeb50afee0c8f72fbaf2 WHIRLPOOL e81704a18b99239a113ee8f1fb60653887f279026436a5c10a7d508c66acc98eafc72af493540f4ef75e5da7bf6d8d4d84041ada1819785f497b11a770dac00f
+DIST genpatches-4.4-69.extras.tar.xz 16468 SHA256 5833e7cf08f0eb1af3f77a1f2d65c3181394d71a7c51d2b9e85bb65053ee287c SHA512 95874e4f2c74633df03f5fbb467e1995ffdd5121792ecb99eda7bd4a7118b72c7edb63763b34b2e6d0a85ce0b61ec78ec7079eb923c3b9c22750d9e94b409611 WHIRLPOOL 8d7922b99128e46cc1192fc18237f4416d2059d2f2aa5c2d31b9691e796781cef972fe448b451ec018a64cc63d0317b1ee8db19b4f00b3d1f7c51bb60061e977
 DIST genpatches-4.9-18.base.tar.xz 385508 SHA256 d29fc16842e846c2c6487e9c1543e6fe43429d34882ac9c6ca070c1fe3564605 SHA512 c1d08b3d66df74efe610cbf586921f7caa57bb8337848380fdc8e2034883180a60a26dab9ded50974fb468d35dc923912ead08cb0f751a515cef85efb31955d9 WHIRLPOOL e1ef981b945718eab2e96470f96a033cc2b1ede6c706d6cd3e32f4f1c4e066766135141d55a5ccee06d9fb84bc66df389cdb2d095ad569bd565afc600b3b4095
 DIST genpatches-4.9-18.experimental.tar.xz 105616 SHA256 209be56c1efb0ba3fbee17f2437bd00b36caecc6c44db2b4e1a0e46ae17640b0 SHA512 37d6983f46ed4031f11f91ffcdacb510b40cab682d71ac471ab3c2ae78598ee9826068afb8b1388d96133635ba2680cc106624e0d79c341d2610b4f74330b773 WHIRLPOOL 5af9422c0526c5e23977f2d25ea683ed1ecf6f9e14a6daf52490bd808e9790cf6f6d9ef96353bda3474197eb954159575a4f0e6a768a86777d9b8a61828d0a0e
 DIST genpatches-4.9-18.extras.tar.xz 17348 SHA256 64167f17f122f969476bf68a3e0493a77d7ae9e78087c2748cdfdc6e6186af2a SHA512 dcbdea379a0e28e9b8ed08b32ee71a36ce9ccc817e5b79f38759031e3324441f3e91e6b7e2802d1a694574bb4ce9e8f441d88ccbbd9280b3a4456eadab7d5fec WHIRLPOOL 1d3ba61d03d17a707a65423e85f7f3a235a9d39fb26e4602b5cf663e097dc9e8618380d7a54db60705e6b38e9c0674330df57a6e243c7215411275a489ab8b42
 DIST genpatches-4.9-26.base.tar.xz 563020 SHA256 2fdd667a8924f924d8b341963ee737564de7f075334344a3f3e113cf9b7974b6 SHA512 9f43a3ad5f6776f0f8c28d1a6048a06969b760a3e8265b4cc3d6abcb908a800843264888c533a1a6350a4d6eb49da04b66f6a1b03014742583e9f1cdff341688 WHIRLPOOL e8a07308570fe525447f87177b4e72a4c2cc1f9724a418647e2e316b96624196033f226ecba8affad1707382d155efce05af723a1033d461681a39b63d6623f8
 DIST genpatches-4.9-26.experimental.tar.xz 106380 SHA256 d916ff32e3062cce15b0d791f37ae0879f705aae0332d925c9dc3b11a4056e2b SHA512 713190bced05a544df5527940844f456ea32318fb4f6409d4a022d39331a9a100d38a342ec1978285689d64dea47ae4f3c3a7ec725ad45cfb9731b11f99e597a WHIRLPOOL e0eadfb3fc68fb32642597fc22557db6a0042ca1e83408cd237d087ec1823453f47467f0778f87749b1a4ea2ced356bf91b881bd06514e7df09f150596d9402b
 DIST genpatches-4.9-26.extras.tar.xz 17348 SHA256 a5a81409396a9e811bcc1e6056eea181207e37adfb8cd1aaa85499810f3c1db1 SHA512 890eed4fd6bdf822320b92219c03712903269c5f454e341b2cfc048482c0856ef1aee832f3ba369bd99c91bf7050ebea37a51b75b867644a7e3b9c1dc3530f66 WHIRLPOOL 38e8783dc65c77ece12d9ea3e18f3902c198ab587c3c949a9f36488267c7f1bda779d8794ba7238104253040d9654f828ad451eccffed9f5fb15642ea0dbd90a
+DIST genpatches-4.9-27.base.tar.xz 575444 SHA256 a0a3b29e69bf3c9bcfff10817cba12dc6a43b9ef8375120a2510b965ccecb78c SHA512 fdb12314dad10086e4c5d26617c44ddafb552e4362195102bfdf68e5b6a0408fe26c5d7d6d04b9e4b929adaa4e804b9b9bb99a2be6dfe31d58f56612d9b59d7c WHIRLPOOL 870b6f518f49543ea557eb4d686e04d446f14424d3fdff2799708ae39d46cba28a4974ee131098332ab00913797227de5ed8cbf15f83fb5e95e28c8d91956f0f
+DIST genpatches-4.9-27.experimental.tar.xz 106396 SHA256 aaa23a58e0cd7284fc3f4a01f24b96e683db49a1b90a3cb3984b3b3cd614ca22 SHA512 8676a26f75ec6481a260bfc41247e7aa3ec5ddb663915db9225219b5b02f6b0f23bb5228aff1aef87bb72061c80c68f62877be2b4280703865dcc74cff2c12b1 WHIRLPOOL 427d8dac9855e585f40600e65bcf1bc934f7084386564881edc77b06ef97127334a9623105cf72e372dac09f00ff3cd9e871e067ef4a7c3d90749b996894dd79
+DIST genpatches-4.9-27.extras.tar.xz 17344 SHA256 a8e82b18ec6263b107065e69b98de016476b89eedd2cb6b451975e5842aea715 SHA512 f5213b36ca334164db9262935b08a0635064bc22bba668e27336281a71be06039efc6ab3cd10c806dee474a44cfd87baac063db91574597942beb52b1cbc7b2e WHIRLPOOL b5b9483235869c003909d5c778838e0fa08be63d386816062db605d528c83bec69c3c1d7b555467500c756588ba2c61bd47ce882b17d9901f828551b8229c843
 DIST genpatches-4.9-8.base.tar.xz 215420 SHA256 4bbde563b43389798188b75c7e65412aaf5300348efeda63071cbd56f1e275e6 SHA512 12641d4a11a8a4d40f16b9d0c62972de2baadc13481697c69a91a2b36844293f4edf207491ae087ce3378bdd0400856070e353c291f34d1cad02d3e3a6c73a36 WHIRLPOOL 98d63bb42729eb8518c6ea4a15cee2a41fe59a9f299bdde9ce86825bd3c563665a95da841b06817e3a4616fd38592737ad502173aa33a0b9eacd3fb31a42956d
 DIST genpatches-4.9-8.experimental.tar.xz 105608 SHA256 217098bec005a1410b2dc1435841c2fc96d9f6022dd2973512d1b0f36e3c20d5 SHA512 69546bc1d846697179aa287a4d1b708b962c0cdcf14b16acb4c696e8ffa38983a679d0f28c2d5df68046c68cc655add1c54c97bfa22f5867d9bba93612e67e2b WHIRLPOOL 7fddabf8821a18607f765948457a44c689b3c527f2f630f1c3af614c8ba244663ed5d03dbaa5af27885d2d708069fa5f94b1c19aa23512806714522973371a59
 DIST genpatches-4.9-8.extras.tar.xz 17300 SHA256 ba08353081cf07a73fb2a5b998c8dadeb94f6ede09ac177f2357925de9f50dd4 SHA512 18ab24c59adc73bab4a49bc5537333ac6a7d11801afce8943ef42878d8b33341648b64d9fbc56be3a49fe6d9ec7728186eb40a348eedfb0b14ee1f5746e0ab4b WHIRLPOOL b352654885c3180a5599bc0a0acc3f9a3828d75ca5ef4a83c49258ca263822b02d974e273071bf913c82a919c4cdbc9283cee9b81edbc40ce640c11f7ad0775d
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.10.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.10.14.ebuild
new file mode 100644
index 000000000000..920163f95fd1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.10.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.66.ebuild
new file mode 100644
index 000000000000..2fbbef1da411
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.66.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="69"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.26.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.26.ebuild
new file mode 100644
index 000000000000..ab96d91bf90e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.26.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="27"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild b/www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild
similarity index 94%
rename from www-client/firefox-bin/firefox-bin-52.1.0.ebuild
rename to www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild
index c3555bbcab07..63712e923b1c 100644
--- a/www-client/firefox-bin/firefox-bin-52.1.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-52.1.0-r2.ebuild
@@ -24,7 +24,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
-inherit multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="${SRC_URI}
@@ -58,8 +58,8 @@ RDEPEND="dev-libs/atk
 	x11-libs/libXt
 	>=x11-libs/pango-1.22.0
 	virtual/freedesktop-icon-theme
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
 	ffmpeg? ( media-video/ffmpeg )
 	selinux? ( sec-policy/selinux-mozilla )
 "
@@ -136,10 +136,11 @@ src_install() {
 
 	# Create /usr/bin/firefox-bin
 	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
 	cat <<-EOF >"${ED}"usr/bin/${PN}
 	#!/bin/sh
 	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse:/opt/firefox/" \\
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
 	GTK_PATH=/usr/lib/gtk-3.0/ \\
 	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
 	EOF
@@ -170,7 +171,7 @@ pkg_postinst() {
 		einfo
 	fi
 	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without apulse or pulseaudio installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/firefox-bin/firefox-bin-53.0.ebuild b/www-client/firefox-bin/firefox-bin-53.0-r2.ebuild
similarity index 91%
rename from www-client/firefox-bin/firefox-bin-53.0.ebuild
rename to www-client/firefox-bin/firefox-bin-53.0-r2.ebuild
index 138b3285c87c..da78aea4869d 100644
--- a/www-client/firefox-bin/firefox-bin-53.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-53.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 # Missing when bumped : be
@@ -15,11 +15,15 @@ son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
 MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
 MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
+inherit eutils pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="${SRC_URI}
@@ -53,8 +57,8 @@ RDEPEND="dev-libs/atk
 	x11-libs/libXt
 	>=x11-libs/pango-1.22.0
 	virtual/freedesktop-icon-theme
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
 	ffmpeg? ( media-video/ffmpeg )
 	selinux? ( sec-policy/selinux-mozilla )
 "
@@ -131,10 +135,11 @@ src_install() {
 
 	# Create /usr/bin/firefox-bin
 	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
 	cat <<-EOF >"${ED}"usr/bin/${PN}
 	#!/bin/sh
 	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse:/opt/firefox/" \\
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
 	GTK_PATH=/usr/lib/gtk-3.0/ \\
 	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
 	EOF
@@ -145,7 +150,7 @@ src_install() {
 	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
 	doins "${T}"/10${PN} || die
 
-	# Plugins dir
+	# Plugins dir, still used for flash
 	share_plugins_dir
 
 	# Required in order to use plugins and even run firefox on hardened.
@@ -165,7 +170,7 @@ pkg_postinst() {
 		einfo
 	fi
 	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without apulse or pulseaudio installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 421d81f0e69f..5a638b5693d8 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_59.0.3071.29-1_amd64.deb 56743916 SHA256 b27f65b98a79460a5ca7d0b05f62b10a5e6baa0b55aa7e1c9509fa2cadef815d SHA512 d7994ad51902294b95fdcae4ee67645c16756ada86b5c834e7424f923df33bd706608d51e6cc82753515caec4e7b483a5c237062d7de90a12220928e1b76a43c WHIRLPOOL 7547c250283d225898ad90670e3b70eb6a60bd4ba00dd356a4181a83819ed7d5f75be9c66db17208cc1e80631cac59f8720afff4541ebc1982b81ab65728d8e6
+DIST google-chrome-beta_59.0.3071.36-1_amd64.deb 59554058 SHA256 7a245c959ccab5caf6cca34f4188b52f30710afbf28587d6da6b6370bdaeff73 SHA512 dc5dfc0840a4fcb23275bc2448f3c6047bbda07a4860514ccb16ed112f9950f215184916548282ffef127d22c0df1cb5ece826be16fb2af2849d65c91f8a755c WHIRLPOOL 4433f82d4f9fa5c83b4ee3b9943e7fc538048b6e4bce167346d04d19377481acc9615c67203a254a8d35913f1277e0be046df3da1c64c102a522dd310a6f0e34
diff --git a/www-client/google-chrome-beta/google-chrome-beta-59.0.3071.29.ebuild b/www-client/google-chrome-beta/google-chrome-beta-59.0.3071.36.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-59.0.3071.29.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-59.0.3071.36.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index f1eabfd88521..4ca6c00ddfb2 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_59.0.3071.29-1_amd64.deb 56743916 SHA256 b27f65b98a79460a5ca7d0b05f62b10a5e6baa0b55aa7e1c9509fa2cadef815d SHA512 d7994ad51902294b95fdcae4ee67645c16756ada86b5c834e7424f923df33bd706608d51e6cc82753515caec4e7b483a5c237062d7de90a12220928e1b76a43c WHIRLPOOL 7547c250283d225898ad90670e3b70eb6a60bd4ba00dd356a4181a83819ed7d5f75be9c66db17208cc1e80631cac59f8720afff4541ebc1982b81ab65728d8e6
+DIST google-chrome-beta_59.0.3071.36-1_amd64.deb 59554058 SHA256 7a245c959ccab5caf6cca34f4188b52f30710afbf28587d6da6b6370bdaeff73 SHA512 dc5dfc0840a4fcb23275bc2448f3c6047bbda07a4860514ccb16ed112f9950f215184916548282ffef127d22c0df1cb5ece826be16fb2af2849d65c91f8a755c WHIRLPOOL 4433f82d4f9fa5c83b4ee3b9943e7fc538048b6e4bce167346d04d19377481acc9615c67203a254a8d35913f1277e0be046df3da1c64c102a522dd310a6f0e34
 DIST google-chrome-stable_58.0.3029.96-1_amd64.deb 53939076 SHA256 15b943941c827ef1a4fa19cb5346b8ad4f3d07a66b0d0a6ba63a39274782661a SHA512 97cbe9e5bd0f558dcc977653865d4ac868e4cdcd39cc084a894939f2c722f98eff784664c62c1a290dec8b78a851e677b5748d8f02a448561e99e5c084fe5a9e WHIRLPOOL 89b950aa9ac2879ef750828cea52729eb43c0a6b4b0095dbb844739f8a3d87a2b8ac273516d602069a05e3f3ce6f1f2b9d264cc2bf55f04707be12a5e4e22504
 DIST google-chrome-unstable_60.0.3080.5-1_amd64.deb 78429958 SHA256 09ed1ff5b8f75cee63cb954182af97662e1e4d43fdd594a2e5af754bcf64e113 SHA512 5dfad810728efb3a2eee05d081a4571c6ae5e45ed21b4d64374c0b61942d222544a46dbb30e3358410490d42ccaa6b67573015a3cc62035c66276523e6045594 WHIRLPOOL caf475764fa541bdede46c1ceba59edd519adb8e1600427541925932c2ba8662f352ec59b391c25bf563b882465c143d4a1ed2314838fcbba980770c23261e8d
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-59.0.3071.29_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-59.0.3071.36_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-59.0.3071.29_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-59.0.3071.36_beta.ebuild
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
index fb1a88ace683..952e69460e04 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,9 +12,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+SRC_URI="x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://http.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/173"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
index 9d82b11e4de3..16667c70f19c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
@@ -12,9 +12,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+SRC_URI="x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://http.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/173"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index 76846eb114ef..ec09f809357a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user versionator udev
 
-NV_URI="http://us.download.nvidia.com/XFree86/"
+NV_URI="http://http.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
index dbd0fce8f878..f140c9b44f0f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user udev
 
-NV_URI="http://us.download.nvidia.com/XFree86/"
+NV_URI="http://http.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
index 42f23ebac1f3..935e7eb78030 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user udev
 
-NV_URI="http://us.download.nvidia.com/XFree86/"
+NV_URI="http://http.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
index 3d7d7ade3823..bd330f4659fb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user udev
 
-NV_URI="http://us.download.nvidia.com/XFree86/"
+NV_URI="http://http.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
index 3cd1af66ffe4..063e27fb94f1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
 	portability toolchain-funcs unpacker user udev
 
-NV_URI="http://us.download.nvidia.com/XFree86/"
+NV_URI="http://http.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
index 5df13a023786..375cbbfcbd35 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,9 +10,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+SRC_URI="x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( http://http.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/96"
diff --git a/x11-plugins/enigmail/enigmail-1.9.6.1.ebuild b/x11-plugins/enigmail/enigmail-1.9.6.1.ebuild
index b8e73d8ec38f..f10b469ea882 100644
--- a/x11-plugins/enigmail/enigmail-1.9.6.1.ebuild
+++ b/x11-plugins/enigmail/enigmail-1.9.6.1.ebuild
@@ -9,7 +9,7 @@ inherit python-any-r1
 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
 HOMEPAGE="http://www.enigmail.net/"
 
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-3"
 IUSE=""
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
new file mode 100644
index 000000000000..edffcc2deb93
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-r3 python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+KEYWORDS=""
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+}
diff --git a/x11-plugins/purple-facebook/Manifest b/x11-plugins/purple-facebook/Manifest
index 8569b6eed6d9..8d1df5ca8076 100644
--- a/x11-plugins/purple-facebook/Manifest
+++ b/x11-plugins/purple-facebook/Manifest
@@ -2,3 +2,4 @@ DIST purple-facebook-20160107.tar.gz 443097 SHA256 96f28491d037752eaa27191516673
 DIST purple-facebook-20160118.tar.gz 443498 SHA256 620b71bba75f0b89f3c52b6ec2e5bd40c0895cadd4ab76910d04b044f88788cf SHA512 bcd07de9b014d32d32cee7f1254060b4999d3bc6bd996f37fea5f74a93a6a9f0be855ac249a62068a1425bc6adf825342c4b0e924f1dbf8e0aba7d215ec9e076 WHIRLPOOL 4789742154df54ca369b453faf409cdc7177b620b3381489613fc69ee3f418414fc611f73ba95e4c402838129b0f03b1eb21228d12abc18676301a79a51aca86
 DIST purple-facebook-20160409.tar.gz 448502 SHA256 bc4420bc46295700af42c2e35adda210ab62ebb8bf9808adc2baba94205d6454 SHA512 961d570c0e29a8016028bbd6c05e1dd6f3b754414e708b4688d7b49e972882833b7acf6334a5b4378f1da1c08d174de9d65123ea5d34522f0739474da6c87c8a WHIRLPOOL f8d469b8352308fc582df069b6f79f1e5a69bb84df818788e1d549cee4649974fa6170b4d22faa3d505a15524c59bcca49a9894df1b572984cb92f533da16d36
 DIST purple-facebook-20170329.tar.gz 458751 SHA256 03b46fc574fa663f6bc318f216776a22332123a33a84ab8b49290c463e713509 SHA512 cce2e3a3419f64348cc1f5d5feaec36c428435cfe959477608db65d7c1cfcf7840ce8037ba816319832bd6269929cb2c57fdc21d72241574f2dc37aa4c993ec7 WHIRLPOOL 551672f22ad73cfd42fe7f26d67948d6c0b012d4158451bc81e5f6474f63b0f812902f4c0fca5817542b3519535d2a423154e8962ba59b279f3ea70671064344
+DIST purple-facebook-20170330.tar.gz 459035 SHA256 bec38bdcc1a81172d1a1d459aa7455b146bf2dda9faa1983fcde08e674220bf3 SHA512 e665e92e25cfdb8eb12ef2e74dc75035ae558b37d504ce9330de254ede94da205b57b180fee373fa1ac16402c0291dbaab1800c8fbdfe0aa50ede5b955294261 WHIRLPOOL d65fd921617ce66309ec5155d83df7a84229970ca8a5b2d2c0395a2437850f52651d0069082919f8eccd5b4e30e8d1c5331a81e9a284c14c50d69aab8e42e68f
diff --git a/x11-plugins/purple-facebook/purple-facebook-20170330.ebuild b/x11-plugins/purple-facebook/purple-facebook-20170330.ebuild
new file mode 100644
index 000000000000..5f438b2d6b0c
--- /dev/null
+++ b/x11-plugins/purple-facebook/purple-facebook-20170330.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+MY_PV="0.9.3-c9b74a765767"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="Facebook protocol plugin for libpurple"
+HOMEPAGE="https://github.com/dequis/purple-facebook"
+SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/json-glib
+	 net-im/pidgin"
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README VERSION )
+
+src_prepare() {
+	eautoreconf
+	default
+}
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index b3220e2eab3a..ada253ff8f8e 100644
--- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -66,7 +66,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use doc GENERATE_DOC)
diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild
index 202cf9be85d0..c3473fd22bd5 100644
--- a/x11-wm/awesome/awesome-3.5.7.ebuild
+++ b/x11-wm/awesome/awesome-3.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -67,7 +67,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use doc GENERATE_DOC)
diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild
index 202cf9be85d0..c3473fd22bd5 100644
--- a/x11-wm/awesome/awesome-3.5.8.ebuild
+++ b/x11-wm/awesome/awesome-3.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -67,7 +67,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use doc GENERATE_DOC)
diff --git a/x11-wm/awesome/awesome-3.5.9.ebuild b/x11-wm/awesome/awesome-3.5.9.ebuild
index 202cf9be85d0..c3473fd22bd5 100644
--- a/x11-wm/awesome/awesome-3.5.9.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -67,7 +67,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use doc GENERATE_DOC)
diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild
index 8ca5253229c7..61d0ec9db01f 100644
--- a/x11-wm/awesome/awesome-4.0-r1.ebuild
+++ b/x11-wm/awesome/awesome-4.0-r1.ebuild
@@ -56,7 +56,6 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild
index 477f77475712..486f4a51e539 100644
--- a/x11-wm/awesome/awesome-4.0.ebuild
+++ b/x11-wm/awesome/awesome-4.0.ebuild
@@ -55,7 +55,6 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild
index 622a02fa667e..594805e0d140 100644
--- a/x11-wm/awesome/awesome-4.1.ebuild
+++ b/x11-wm/awesome/awesome-4.1.ebuild
@@ -56,7 +56,6 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 7da78011b9a9..d659a191d6fc 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -55,7 +55,6 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
diff --git a/x11-wm/sawfish/metadata.xml b/x11-wm/sawfish/metadata.xml
index b8073de1edbd..d305b1f6a31c 100644
--- a/x11-wm/sawfish/metadata.xml
+++ b/x11-wm/sawfish/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->
 <maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <description>Components installed with USE=emacs.
-    Do not assign for anything else.</description>
+  <email>gnu-emacs@gentoo.org</email>
+  <description>
+    Components installed with USE=emacs.
+    Do not assign for anything else.
+  </description>
 </maintainer>
 </pkgmetadata>