gentoo resync : 05.01.2018

213 files changed, 149 insertions, 6575 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3bf1558939d2..24f81f2729d6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 19611cecf52d..adb51b08a9ba 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,6 @@
-DIST boto3-1.3.1.tar.gz 176717 BLAKE2B 2773e34f4fb36f928d5c60cbee7707db59d635fd9d5909884e531d83cedd4d5a4d45acdb439fc4066e7be7bdbe13bcf1e1cf0eb85080806fcd06408c01a046e4 SHA512 10fa396e8896a157e80d028b590056dd8e967afec37062056d94fab45652d4adedbe5e98f1cc67c6c8b9ae9282145367b4e1973fd7506170e486b026b57db9f5
-DIST boto3-1.4.0.tar.gz 183263 BLAKE2B 9ba998d0d21c2234e95724cd268d2ca98b67ac6fbe2d2bec537b493c89b09becc397e87f6ec9f0306684804701f0ca66e0154ad8a6a07930810f36013fb8a7d9 SHA512 9e678b26993f48f156a5acdb33aec3488d263230517e6b5e1e608cb007fbf4f29a3c33290e460eb7cf1031f87894f3daca03bf80048139435979f23dd2fd61b8
-DIST boto3-1.4.1.tar.gz 188341 BLAKE2B e6f418ebe0c065e6c746f7fb94f95ea47c3833577109bde8a7e4afd3fed5e715634c5b2a48d077a96a1754d8ca86044aed1ad3668bba51fd4bee5a8000d3bc49 SHA512 525f2db50d0a9d6f452c0261e934ecd9f06b576154b128d209a729b0fe96190e641369c00e13700f2aba5fe4a0c02f80248e25bc3d716cb72752d645e880eb23
-DIST boto3-1.4.4.tar.gz 194721 BLAKE2B f621e26dcb795218a37d8cd7a21a341740aec9ec64cc5fdbf56329c631f54aeea90515e48413e9c4822eb51562275ade2b97d40215e996da28babd322960f0c8 SHA512 948d753809e41bad39fdf3da9646b62ff2fbc9d23966cdd0e46b2df18b07ff8c8af11bb777aa0cd1fea5bcdbc2d43f3f3d06012e30327e3c55b36f7bba815a61
-DIST boto3-1.4.6.tar.gz 217110 BLAKE2B b666011953702f475696cbd4ca730326a5c75f9ec88777681c44f2e4df8d73b5afd6e9899c0aa0bacdb8a56325c9bc1107a66c7184dd6df8a4b91914d8f32558 SHA512 194be548af8b11fa14721a23934a811717c6e8a70178682c392626aaf97fd5738c7aeb83366d7951c2b69d63acc83f26059e3f0cb0b26f5d412ba606e02315e7
 DIST boto3-1.4.7.tar.gz 217171 BLAKE2B 900c5c4249df9d0c3b5d157835f66be5e7cd3e2f4b934047340614ef729d30a5952f2996f1638626a10f9e5e55cb05d4792241b6f7da9c5157da9caeb464acac SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3
-DIST boto3-1.4.8.tar.gz 217204 BLAKE2B d402c34608f86c8a337f39b816bf5202f3a231f8a15cb16da64fe2443d7ee9b3703eac7e57e4929cf07c4387f0eb4d029749e3d3368a23dfeb531da291b72e62 SHA512 91985508b02eb24e5770c51b17faca2e0cf194a1ca4cfc8313d296fee25001be729d9a5d5f9960bc3d756c6eefbb8694cbb931cb0109704401c4255f0486cb53
 DIST boto3-1.5.6.tar.gz 218891 BLAKE2B e2f9b567d8c4daad21895a6e8eff7e004229d96715e648c0f62705d5b3db1520e98e1b93d88650e8be98517e971258c0fae92ba09622f86081bb1a1665937645 SHA512 15eacfdf059634ad86a5c41b0ca237e24a6602b0cf9c897fc3d89b02dbebc93043c338d0e1d89d47bb619521943807829f67a384f450987ad5c85b34d1c76d81
-EBUILD boto3-1.3.1.ebuild 1440 BLAKE2B 68cac9e93ae9077e2a2dad682f3d8fc3bcd2735a555b5812d06af5100d49a295e60775eadfe8075e5b6528c1b7b59a44cd3fd41c73d9f98ac9e0d8eef203769a SHA512 db1347d961624cb0ad838d7bf23f1d54ad9b7743c0e75b203c0d32c25689eeedbef9c400f04d5b7e1759ffebdc9d3304cdbf479b5ef3be947f819173ae8154e8
-EBUILD boto3-1.4.0.ebuild 1372 BLAKE2B 8665c888aa8f9e9141daf398f0ed44b59209b416660a54c4c1a68e35e727657fb751824c162c33d26c3ccb10abfcdfdd280607670b95b5c736872382f8bdd92d SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9
-EBUILD boto3-1.4.1.ebuild 1372 BLAKE2B 8665c888aa8f9e9141daf398f0ed44b59209b416660a54c4c1a68e35e727657fb751824c162c33d26c3ccb10abfcdfdd280607670b95b5c736872382f8bdd92d SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9
-EBUILD boto3-1.4.4.ebuild 1413 BLAKE2B b7ddeb840227c5e870462e34e5612dc327d7f43e0b5e25cd7753f6892d9220ffecebef01caba16ae341b5587e57c5a2c446d538dc0b9b2c2a5bbc4e00f94efa3 SHA512 4dfd9bffdc5e5be744fc636748be1f67f0ca75931960f4f23217f2fe0e96976573a24d3d8fb7dbb043e549f27c42a4a3d08fd879dd6af5707e1fa5ec184f6881
-EBUILD boto3-1.4.6.ebuild 1415 BLAKE2B 95c84a2fac3e2ef0c1aed0e2aecc2a3926f8276d96f54c9d8f75ac603d8f600390dc7fd5c006b4d3fb865195827d3023c6134013510da9944f5ae6b72fd8f2fd SHA512 e68589c48a61e2a27a3ce83aaf6daa1707585f4846cbef34381be505b26ae8c63eef8c4574f8de5c2cf78161b7f19c704a03a382ca167b360403fde6cf43bdc3
 EBUILD boto3-1.4.7.ebuild 1413 BLAKE2B b9305754545fc6818476a70e19ea68883c01f9ff56613616836d5950b96ed2c15cdfb84657a4e38e6d168c3f3704bbbc8d58eded87d673ae3075d97527cbc047 SHA512 57902ff38cc3bc44cbcbcd83a9265fe360bed5992a27367f3e5ab00fce7ce0e469fb41db6c65d593ab070c57d3f86f56338adca5a04d4febd81927fa57c26b07
-EBUILD boto3-1.4.8.ebuild 1394 BLAKE2B f5b5b1540c46762133f45f8a039fc283af082abed65a7ddc6a872429a2d5e667f8b2d1ebd19a4902d4ba388a7253d70b9830376f26f01a5b0a2d367a688e133d SHA512 30b3cb04310eb8f09c6f7b0025b1ed7c0dcb27c3b55b6fafee86c80b4473b08eb4a6102a22abdca5ad667255e6a71a0a9e57001ea4c3a48b390a1a039f152570
 EBUILD boto3-1.5.6.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
 EBUILD boto3-9999.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
 MISC metadata.xml 433 BLAKE2B a94a845e402ed0f6d4e9756babc64f07bd3d1c8600198f6fb77a6fc36a593904baa5cfbb833607cfdc74551b6429c05ad6e7b9947373b05a9fef43df6abb55f5 SHA512 b85e30e557a6bc3432c4bfb53e882f6652de9a68ec1e2ca157bfe27234e2c79f9a68195234e0dc631e3ee19a5331e547af40d09ea1d3acd095bf35eb108af3d5
diff --git a/dev-python/boto3/boto3-1.3.1.ebuild b/dev-python/boto3/boto3-1.3.1.ebuild
deleted file mode 100644
index 3067c8a13510..000000000000
--- a/dev-python/boto3/boto3-1.3.1.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 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.4.0.ebuild b/dev-python/boto3/boto3-1.4.0.ebuild
deleted file mode 100644
index 997ce9dc64d3..000000000000
--- a/dev-python/boto3/boto3-1.4.0.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 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.4.1.ebuild b/dev-python/boto3/boto3-1.4.1.ebuild
deleted file mode 100644
index 997ce9dc64d3..000000000000
--- a/dev-python/boto3/boto3-1.4.1.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 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.4.4.ebuild b/dev-python/boto3/boto3-1.4.4.ebuild
deleted file mode 100644
index 0db70e9542c2..000000000000
--- a/dev-python/boto3/boto3-1.4.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=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.4.6.ebuild b/dev-python/boto3/boto3-1.4.6.ebuild
deleted file mode 100644
index aecf34edcf5a..000000000000
--- a/dev-python/boto3/boto3-1.4.6.ebuild
+++ /dev/null
@@ -1,54 +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 python3_5 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.4.8.ebuild b/dev-python/boto3/boto3-1.4.8.ebuild
deleted file mode 100644
index 887a8afe96a2..000000000000
--- a/dev-python/boto3/boto3-1.4.8.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/botocore-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c2f3c9f835c6..5787b2388bd8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,25 +1,7 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.4.60.tar.gz 2908934 BLAKE2B 1140363c426646dd40ae3d658a0c10873643cf9870631089f8639542a55a6cecd2e221cb97c626b1e23ccb3691ec25b724a31eddf7e1a63f21895fb88d3b4e4f SHA512 77fb9e20d54455e1a200ef53db64491383e361f318ce903350beb13ce81edc438dc75642afa3c6825a1c5d3d517bd456ce362a7c917a6c725b2fe3638007858f
-DIST botocore-1.4.62.tar.gz 2912358 BLAKE2B 014e9ae67705a60c25c2e02f85d893c7af0bc9eb8e457eada83187d40b7a722e9f48dc40e0b4dcb319ec55a79a9015e72ad140300adc79af828a920309fd6e28 SHA512 bdef1da605541831592c25ccd99fb42e2bbf0a713cce650dcc8bfc04df816af88eaa56875fbb06d2f6efb8cf7b42cadc67cae566e892653e897d2e2625d5ea97
-DIST botocore-1.4.65.tar.gz 2946032 BLAKE2B f8a8e15d8e193270496bc74b7ae1d03d01302e155a06cf416e2e225779ff4e272112499b17ec80050ac3e4db50f159d7daac6099f3a276c65b29f4bbe26e21fc SHA512 ee3cf9c8b6fd0d6adb7f423c2a72a2d5ac2e7efd314c07c2d5014580b700f26bacb6bc09a75a295b5d508234446640cfed641d39515a8d658ba8c35df3240358
-DIST botocore-1.4.93.tar.gz 3306809 BLAKE2B a3d1807ccc2fde66bb5b162b225964f6d757c4e3032a0ab8419c5bd533587603ef066012627d21892cdf83bfc890a0d5aaefaeab0397b3cdf1ec01723bdb1d73 SHA512 ce4ac735e5413932d5545b6319f63e6080cee8f4e511e3886bd47a6785bf1986236eb8ed48248836b29fc433a015807fae8dfbc3b6dc1f7e94088e380c7b0332
-DIST botocore-1.5.52.tar.gz 3606403 BLAKE2B e0e6deeec64e9235acf7cfd1b52a696aebc87c076a9d2843bacef0848d05204fe70eba4f0011ee1cc3d3c81c27e60b8f205059688a4b3cebc14d16e32ffbd9bf SHA512 f8a1ed1b768cbe26e9fc75a81b08dbb012b37576342452acde21f48e9c314093ce1dd7ec8eabcc8c8a14e2209d809450bd4798eddb55215dcc387130243d8bf4
-DIST botocore-1.5.90.tar.gz 3707524 BLAKE2B 8509594072f0c220a388b97641726a8e2a693322898f4c924a90e8d6fc4f15c797d53cd241389305178d01a5e8c5944e80dd4e24d9c321ed2dd8f9d62f58e738 SHA512 2a241c29c4874f632932f453954ca15469087b467ed36453db05fa219e81b6aa924aca672f01747de071091ffe6d55fa731ec124f7b47783176c79cf141dc82d
-DIST botocore-1.5.95.tar.gz 3712795 BLAKE2B 1c9b88e144aabea907919dbf1387f46b1a1a45db57c1f8cb5a7c48c23c43927afb517ccefb70da1b18465bc407332a775452cbade0d7fd5fbfb38103bc4070d0 SHA512 872fac30476e3f05fa065ea2963b2221046d0eb7cd91267b0f9209fcd05b81b29eba99c439ad220a81c98a880b4087d961667d8a27c560cd9ba4481b8bc703c9
-DIST botocore-1.6.8.tar.gz 3769332 BLAKE2B 21623cf7d8fe3dba1a87698b89f3bfcbed161f7d06e3ef02a2bbf117280945a860ce5cd309987ef3eab24441facb8952c8bf7e7e9f2eddf1697791b95c0e6e59 SHA512 2565127620793eb94ef817a4295af3484aa7f30268fa915d37b82c5dc240ae2d74eea60bf68bdaf3d180648ff4225455e9453d75454d5a6d5ffadd19f2a2bd05
 DIST botocore-1.7.39.tar.gz 3838231 BLAKE2B 53355a6f0fca131db8ae41ff7e0b5405dc2a4c1a0630743ec34e0fabe60468d27ea9d36b67dc3b8757c3f524eabf3fef1e55d3eb0df1f4c5bd229448f8dfc3d4 SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22
 DIST botocore-1.8.20.tar.gz 4173990 BLAKE2B ce9813c77b440fdfd123593aeb9f5c47bec877981dad5089b83633deebab3bf4aed76c13ac73f571eeb8349406b3f04e6c33634a865e076ffdca266cf418b80c SHA512 0b822bff75ef26c7e996e354a5c06cb50eb13d7e58f65297adcf023a81084c8b98500c08b906dcfd346e2dadcdde33d472d6d51c3e081af8667c5adcdd2deffd
-DIST botocore-1.8.6.tar.gz 4142560 BLAKE2B 2350f448b9e11ef1f65aa6b9dea3cdd57fd2ad74e2d73e716a5b77478fec925b69cf283f64c37226d11b8e91486a523ed4bf2c68c886b97b5e9129fbdbc1ba42 SHA512 5d91033aa81dee1d3115f4db32c1d8f892324f96ef5233f29d35f43a9a9d2ea4adc58d1a2d66eeeb0bb7332904a29398e31b91a486bea71552ed1d0246e8f804
-EBUILD botocore-1.4.60.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
-EBUILD botocore-1.4.62.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
-EBUILD botocore-1.4.65.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
-EBUILD botocore-1.4.93.ebuild 1310 BLAKE2B d8f26c1c6a03f5e4768d73b56a8cca5e8a218b81e13efe61120afd46ad6e62dd08661a8c945bac90b5f4a7a8ca002c1039fc009a71440771913d88c24cc92d70 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d
-EBUILD botocore-1.5.52.ebuild 1310 BLAKE2B d8f26c1c6a03f5e4768d73b56a8cca5e8a218b81e13efe61120afd46ad6e62dd08661a8c945bac90b5f4a7a8ca002c1039fc009a71440771913d88c24cc92d70 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d
-EBUILD botocore-1.5.90.ebuild 1344 BLAKE2B d7760bdbaac7915c853133c85683d73585d5ed39cc154b2591810e8e68a4d2ade59f2c8a1cc2545eb3e0b5f1d12452076ac63fe0560f61fca3524dcb4dfefa8a SHA512 dd834f7e2462a374ff49fa07398679152e02e01f61432332f22b9275e239577481573ccebc79db7355281b66deb3445c97d2f88187784a6328da39b07b9375a2
-EBUILD botocore-1.5.95.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
-EBUILD botocore-1.6.8.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 EBUILD botocore-1.7.39.ebuild 1344 BLAKE2B 1f0cfff06a615aa3abb56213721dba88a548bb336715e21b67f1d4f367b2bfbcc7c1a5415123fc8b392a9828cb49d1f97defb7f89620e89aef0088845223b425 SHA512 d6b49f170d12c9611f292cd1370d7506bd95eb1f88d0ae0a44111c81619393e00456eebe7de733de1bf988bd43eeced819554fcaac5f89cedad14d6a55cdc40f
 EBUILD botocore-1.8.20.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
-EBUILD botocore-1.8.6.ebuild 1569 BLAKE2B 2d0607b52aaf52b0d3f7d3e558864eb149383e0811ce7c1c1ae7380a311c6897028be44a8b39d14522476ba516c5854d0ef8b86c28bb946389d3902d94bd2c38 SHA512 536139e0b494ea55a1bb85605209a2f806daabcf8050ba03087f9f631469e2bc4f9c168ff0762b7b3c3be3012244dd7c74986ee57a795fa25b8a16cef5e36153
 EBUILD botocore-9999.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
 MISC metadata.xml 482 BLAKE2B 32f49cb53c6116989ba95b90ce5e6967b870e6fbce0125597f81a97d119b0d0206458e9683f3714f8708bad8b8e3a17bdfae49ed737ce9e8ddab37cedb19ad74 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59
diff --git a/dev-python/botocore/botocore-1.4.60.ebuild b/dev-python/botocore/botocore-1.4.60.ebuild
deleted file mode 100644
index c664e9bbee76..000000000000
--- a/dev-python/botocore/botocore-1.4.60.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
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || 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/botocore/botocore-1.4.62.ebuild b/dev-python/botocore/botocore-1.4.62.ebuild
deleted file mode 100644
index c664e9bbee76..000000000000
--- a/dev-python/botocore/botocore-1.4.62.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
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || 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/botocore/botocore-1.4.65.ebuild b/dev-python/botocore/botocore-1.4.65.ebuild
deleted file mode 100644
index c664e9bbee76..000000000000
--- a/dev-python/botocore/botocore-1.4.65.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
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || 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/botocore/botocore-1.4.93.ebuild b/dev-python/botocore/botocore-1.4.93.ebuild
deleted file mode 100644
index 322ce139a38e..000000000000
--- a/dev-python/botocore/botocore-1.4.93.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit || 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/botocore/botocore-1.5.52.ebuild b/dev-python/botocore/botocore-1.5.52.ebuild
deleted file mode 100644
index 322ce139a38e..000000000000
--- a/dev-python/botocore/botocore-1.5.52.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit || 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/botocore/botocore-1.5.90.ebuild b/dev-python/botocore/botocore-1.5.90.ebuild
deleted file mode 100644
index f9c2630ae401..000000000000
--- a/dev-python/botocore/botocore-1.5.90.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit || 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/botocore/botocore-1.5.95.ebuild b/dev-python/botocore/botocore-1.5.95.ebuild
deleted file mode 100644
index f4df2f35b9af..000000000000
--- a/dev-python/botocore/botocore-1.5.95.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit || 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/botocore/botocore-1.6.8.ebuild b/dev-python/botocore/botocore-1.6.8.ebuild
deleted file mode 100644
index f4df2f35b9af..000000000000
--- a/dev-python/botocore/botocore-1.6.8.ebuild
+++ /dev/null
@@ -1,53 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit || 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/botocore/botocore-1.8.6.ebuild b/dev-python/botocore/botocore-1.8.6.ebuild
deleted file mode 100644
index 08b1d49616cb..000000000000
--- a/dev-python/botocore/botocore-1.8.6.ebuild
+++ /dev/null
@@ -1,56 +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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional 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/brython/Manifest b/dev-python/brython/Manifest
index ec99737ee5f2..95b31f95d743 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,3 +1,3 @@
 DIST brython-3.3.3.zip 10040987 BLAKE2B a6a238ac6189e9170653c1987db46f2e0735f25deccaf0318ebc669b48dce1330acf333ef27300f1061e7e18044cfa24fadc02265d0fe3a83d0aa8b97f4de684 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249
-EBUILD brython-3.3.3.ebuild 738 BLAKE2B b56b0a47006068b90794ec3673972e3e2fccfac1d46624ca94193c4874978debeefcc7214e2b2009e6d7fae90793bceb58a08df8860850affba6cf6cf9680ce2 SHA512 454f63ccb33263c37e4e915e692a3c656a4ef04702e2070e49cd7584463ee52fc54972d69f6039461988e1d9fb7467ae5be847d13aeb6b846f3853bb188b3b55
+EBUILD brython-3.3.3.ebuild 747 BLAKE2B 2c672a8e865b552476c5e59e7dfec48e5698407b595803b2e9d46d8a4cd446052bae546fe6ce65c50e96884e3f9f720638f42121250d2762b1401dafaa54f96e SHA512 57185eba9f856aabead84341def359931f577e54fa2f53b11d46eef0548e3c616f4de6a2a3b6c71240cb50d7b4ea97958dd877bf1004e578ffa22f1230793c6d
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.3.3.ebuild b/dev-python/brython/brython-3.3.3.ebuild
index daf93da7bb9c..1bb52e1c59ad 100644
--- a/dev-python/brython/brython-3.3.3.ebuild
+++ b/dev-python/brython/brython-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ DESCRIPTION="A Python 3 implementation for client-side web programming"
 HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
 
+SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc ppc64 x86"
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 391df40b318e..5e06f9fa152f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,4 +1,3 @@
-AUX cryptography-1.7.2-libressl-2.5.1.patch 851 BLAKE2B b7b16139221361e967337a887d546d36be79bfc81db6deda0f00d2c6982f3fa1e85434345b0f0277a79a2437b36dcd0a28ebcfb8f0582421b3df91ceca8fdb37 SHA512 f2817b03d888201b32fe2fceec568f9df3addf172e699b5e8a7f4cc94a80c88c0b1e8408fba52d253c53d0efa1c3eaa978470a45439b02422f623edbaa351933
 DIST cryptography-1.7.1.tar.gz 420673 BLAKE2B 8c0257187f29173bae610f191f6ae3251e5dd2cfcbe639020d1ea8f94a09bfe4281c9f6b2c85aefc1989c5832eab4db40c226a8a2e12c4dcbf6241555dafa628 SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40
 DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
diff --git a/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch b/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch
deleted file mode 100644
index 38fce99a5ef6..000000000000
--- a/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN cryptography-1.7.2.orig/src/_cffi_src/openssl/x509_vfy.py cryptography-1.7.2/src/_cffi_src/openssl/x509_vfy.py
---- cryptography-1.7.2.orig/src/_cffi_src/openssl/x509_vfy.py	2017-01-27 15:09:52.000000000 +0000
-+++ cryptography-1.7.2/src/_cffi_src/openssl/x509_vfy.py	2017-02-26 15:15:09.889855740 +0000
-@@ -221,10 +221,12 @@
- static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
- static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
- static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
-+#ifndef X509_V_ERR_HOSTNAME_MISMATCH
- static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
- static const long X509_V_ERR_EMAIL_MISMATCH = 0;
- static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
- #endif
-+#endif
-
- /* OpenSSL 1.0.2beta2+ verification parameters */
- #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 359ed326e78c..925f604d1228 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,7 @@
 DIST fonttools-3.0.tar.gz 298992 BLAKE2B 74adad38ea49e95b19a306d7a37cdff60f9983d32f4cce0685135153f1cd9adaf1b344edff57cdb060ec085dfde41d9f096e4eb49d5789494e19e54343c55316 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e
 DIST fonttools-3.20.1.tar.gz 998249 BLAKE2B e6949d421d317cf2ddfe5d77f59b770b6a7ae97d6b3fca319ef36b81291478e66389043e1482d7685ab01a1fea31fa0d2eebb9310e7628f65dbdaf177fd0bbd7 SHA512 62945c6bb38f53d986f5637dc41273aabda53726eea9d0ae558768aab129bd4dd2c8d1632c16059b09f41a7c957a5ad310fac8669e37fa342259ccd290408cb9
+DIST fonttools-3.21.1.tar.gz 1002962 BLAKE2B c60d95b769abda7c973b5226d6ed5f23fe4ef159f7ddbdef8fcb4bda27f173f6a1856c596ef845954d4d555e3c475242bd03abfd37cfd0553ee87f86f733d1d3 SHA512 db06d84e7a2998b317a4166be328bf3e8ed1e168e623993f120c94df1e8ee35e6836b906cb53b15d3abbda7ca84ca4924b708d03b6e2fe96414d4f4007777f4f
 EBUILD fonttools-3.0.ebuild 715 BLAKE2B d975c56505f0e4259687a0a3de8b4d98d9e2d47ac732db0e7127545a73e1748bbca9a48888da2c1cd9a70d223b3a2574d8aa8b4b2e40e6e47249d95e54bfde10 SHA512 5ff43c81e6109df1cab0d27c059c85e20e6fb268b4bad6168fcd88b7a2f317b3ffd3f20ee4634e43e0deadd2cbfdf24936c0099cf4114d8944ac846ca2604822
-EBUILD fonttools-3.20.1.ebuild 782 BLAKE2B aec011f11dcdbf1df23b53f53cfb3609807a3177f7d5b88478db6ea6482856d3f6cd48ad5a5d6ae36575b1ea6b3b50f1ffe30ef9f78f3d259564f64cbe81365d SHA512 a23fb33013aa596a1bce66b2865f3415ca8fb367a6fb1652b73e16e61f662507a78d0560497d96a789e9e5309659cebd4a81b1956044311259a99a1e71dc8ccb
+EBUILD fonttools-3.20.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
+EBUILD fonttools-3.21.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.20.1.ebuild b/dev-python/fonttools/fonttools-3.20.1.ebuild
index 19ab74bba8d4..1585a70af801 100644
--- a/dev-python/fonttools/fonttools-3.20.1.ebuild
+++ b/dev-python/fonttools/fonttools-3.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/fonttools/fonttools-3.21.1.ebuild b/dev-python/fonttools/fonttools-3.21.1.ebuild
new file mode 100644
index 000000000000..1585a70af801
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.21.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	touch Tests/svgLib/__init__.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 64fcd641160c..5c0c7b3e97dd 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,5 +1,3 @@
 DIST geopy-1.11.0.tar.gz 72035 BLAKE2B 9d0ab7407f629ccc942e55d3529dbcfa792c50046aad7a23801803085f21675ed4bb3b734c430c5f7842a6f1f69d679a5ab9b37e4e60eefd48efa30a11468557 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b
-DIST geopy-1.8.1.tar.gz 67542 BLAKE2B 73d3d8c1b716fe9cde8d8f5af4ef485957afcb595550d3b5b9c773cdcaa89470ca88dedbef4f8b73d6acb227ec1cf96898a43cb08f2ad7eda9adbb2afe093deb SHA512 0df2e67ed35d5cc3f796e3188df3a37d8fa101a4b6feb6b760ea08087ba44c350765a8c1032012b5e762454fa15c520f97d59ff942f07047927ef4872232a57c
 EBUILD geopy-1.11.0.ebuild 2291 BLAKE2B dae6426d50b71e33b8529c380e04d6137b8c07bef2a56332c34d410c83009f9b4764ffed5cfb32532217821fdf12071f99b76edf7bb1955cdc88329c1c11d5f8 SHA512 6e7dd83a59537d0665d3cb90483d3287d54753c9069a52ef2ddfdfbb437956d0538c5583aa496e756afac680a235761e8def6e31161a93378b8f27bf3b04c7c9
-EBUILD geopy-1.8.1.ebuild 2005 BLAKE2B cebaac96c3fb1015e014990fefeaf187617d820f62330dbb3e140e288714c451890d6325ab87a6390d21b14bc2e6f3119b669ddfc27be5a2bd2dfd5ff685d36d SHA512 de16f758bac7b8bbc7e41393d9614c27c46e52af9d77a2ea4c3d9673b5024f91474a774d0d5d21740bc0f6561f429f4eb42763c2ec5e926c6bc21c6b2e5e9090
 MISC metadata.xml 566 BLAKE2B ea35386f802c3a3d619e8531eabad55dfcc4da3ce7895859aab57bba610f52bee9f026513ca8a983a19a7eb52e6464240d629577381e1ba0030dfd4c8577a659 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843
diff --git a/dev-python/geopy/geopy-1.8.1.ebuild b/dev-python/geopy/geopy-1.8.1.ebuild
deleted file mode 100644
index 43bd2cdb513e..000000000000
--- a/dev-python/geopy/geopy-1.8.1.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
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="test doc yahoo"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
-		dev-python/placefinder[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}] )
-	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/python-docs-2.7.6-r1:2.7 )"
-
-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}'|" docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-
-	# prevent install of test folder to avoid file collisions
-	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
-}
-
-python_test() {
-	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
-	# i.e. "You should provide an api key and a username with a password"
-	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
-	# It appears it MAY stem from nose rather than geopy's suite
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
-
-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/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 90cef0c8aeec..5c6ba68d3425 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,7 +1,5 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
 DIST gevent-websocket-0.9.3.tar.gz 16463 BLAKE2B b5def54cb76c377e04210e3490e69d7daf73fd38c3f0d4e632272cbe863c50af50cde121bb493121ee24ac96d3ae9da63ee52a12d40718c1736931e0f2adf7bd SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73
-DIST gevent-websocket-0.9.5.tar.gz 16970 BLAKE2B a513cc1869c86a26bc3090dacba359d31b0dbeb1cdc897ff46f80e7e30015a817e6f99102198300dc5fd5cf6485f73c5d30442d8f72aa387c5c6fef8772f48be SHA512 fdaa8c704e1d0869700cf67c3a1c04246bfd816f98beac9c755b723a2074aa26344991c924ebdd7de5661065cde48ad412685014c53fdb92df12401cad3c358c
 EBUILD gevent-websocket-0.10.1.ebuild 536 BLAKE2B a855c9065a63c28a10216716409fc768a4f3f66f0575aa8b7d1c8c360f4b315ff088abd3c36f2539640371175627233b511e8be6509a91271a0c11bb3e29f711 SHA512 fc964b23394a4e97b8c0c9d924ab6104ce37f12ffad0d3607a5711c68fb66a62402ffa7672d60a8cd46e6b9a8374ee267b02eea5ed6a969471581029c2f68bcc
 EBUILD gevent-websocket-0.9.3.ebuild 518 BLAKE2B e45f390de7695514365f7901091f219e91cf053b9584b59ae378e3be40a1d8efd7220c5a7dda4ab22e68f39491a16490264f3415698a8cef2e79cd12c0504ba1 SHA512 4073362fa970ba73dedd7a2da8421f0a447dbf71a354bc2efcbcd24ea64ab8c561d5075fab1e0de09998e03b313d22b61abc8d771c5374837c30196ab4f836d3
-EBUILD gevent-websocket-0.9.5.ebuild 520 BLAKE2B 6b604b521964cbd06d7ca8abeb1dcd046fa116b754cda803ec4a4a54d6f32fe8d7e2a442214fe6d1d057f2df58afbf175bbff5b5ede806121eedccff0fd7bd0b SHA512 4038497a6dbfe23f401fe42ce025c5c4610cd68a0e4d474510a55e1279a5fa100e19db20da34f73d32e6e0eb127ea78a0633961da463616496855bc033a8ed7b
 MISC metadata.xml 820 BLAKE2B 11073a77d288c0147cb1aef5bc278d1fc9b3d121dd62b0f0cae09912d02beb5955ff29af9f72819edb4194d81307c73c5560550940c4706c1ecd2b8e7b423bdb SHA512 60a1d9bd86378314c37895e21d329a63b74d2f31dea971e9aa8ad320d7d8ccfc1d14a638b3881e1c942aac435d6601f89100526f2f25c44bd7717a8553f6bb5a
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
deleted file mode 100644
index 0733d0b100d8..000000000000
--- a/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
+++ /dev/null
@@ -1,20 +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="Websocket handler for the gevent pywsgi server"
-HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index 2d799ceea5aa..db8ee54cd7bc 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,9 +1,5 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
-DIST GitPython-2.0.6.tar.gz 406234 BLAKE2B cce0f958a5b741058880120175ef159cb93745f304ac646cad558780b559515148fa4aef10886df90f25e8bec6813360ad1e9695adeb143067ea37c6f57f4cc9 SHA512 97a64e715b2d78d58542de5adcf679aa73a64bae49b6c76c2ac56a8ffaa0f712f80b239a39408d79395bf4c3a6e5ca7c5ee21a166a8b4da597c898f92a5a123d
-DIST GitPython-2.1.5.tar.gz 420147 BLAKE2B 17d2ac4bb37d2145434b0dab76e458438455ea5e48992695da0e205e8012aef1b1036f6d35ab0ad7aceec8b2cb6a112427728fb4a282100d757029008f987519 SHA512 40350434edb12d3335ea6a9f0176df4eff0564c8c8388f6a9769d2ab9e46c708625849a079eaf4e1c5aa9eaf10d91f439097277d67e3c6b5e9659a88bfcdd4e2
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1076 BLAKE2B bacb27cbf0c73d8fbcd64bd068c448c37ce03324445f192478a0100d97866401c64a3b2655cc6ec5dfdbbb4030abf878d22f43af577f9bf7812b80158f81bfde SHA512 bb2712caa805494c2fb755c651abc50ad4063055bbd46347a7330980473f322ea1eebcd4327c3f07240bdbef9dcb8493ba7e173c7c93dcf0bc86f0220525d2c9
-EBUILD git-python-2.0.6.ebuild 1085 BLAKE2B e6cf4c390089989b5cf8f8117fabc308f0330910fa445b74d3f12024fa2d12d97763a74032955d43f95e8c67b1105296e97555dad7fe339af0b1ff31a336d88b SHA512 ebe6b3e8e3e3f6175256ec6bc026be934382e28afe52ef1953016260b232b9aafd34fe28381961dff4532106a035bd9b6f9fedb6368bcca97221005289d58732
-EBUILD git-python-2.1.5.ebuild 878 BLAKE2B 7c1c94788f525a2110d48131600b62d52669ac12f3549bbea5587e81089e977ab9d3991fe9e50e00687206b4494d173e48c17febcfe6108df5527913905a720e SHA512 5947ccc99d977ffc585b7175f9d3d8d7c6b787aa64dd7c2e0690b86aced3a2e7f361fe622f23a04f010c4f049a4db7bb3725e64cf671de1b60d865faec3b24d0
 EBUILD git-python-2.1.7.ebuild 878 BLAKE2B 5f70d5b758456cacb9b14ccdd61247983d55d3fbd209b2bc81d41c57f8b12609c32a9d88e5dcab161feae526c94667629e9ccd39f970705418993b7e5a849314 SHA512 da8191a957788003e50595392c91c68479cdde5c6022dbf6d038f078eb532849ecb25781bdebeff283fc1e3ab2244d84ddd698bf668a282413bb5272a37b211e
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.0.6.ebuild b/dev-python/git-python/git-python-2.0.6.ebuild
deleted file mode 100644
index 3d1c453295f3..000000000000
--- a/dev-python/git-python/git-python-2.0.6.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="GitPython"
-MY_PV="${PV/_rc/.RC}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Tests dont make sense without a git repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-vcs/git
-	 >=dev-python/gitdb-0.6.4[${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/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-# is the correct entry for mock, however while RESTRICT="test"
-# there is little point in setting it since it is inactive
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/git-python-2.1.5.ebuild b/dev-python/git-python/git-python-2.1.5.ebuild
deleted file mode 100644
index 88367417a705..000000000000
--- a/dev-python/git-python/git-python-2.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="GitPython"
-MY_PV="${PV/_rc/.RC}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Tests only work with the GitPython repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-vcs/git
-	 >=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 1acdf92bc5d7..b1288a6910ed 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-python-client-1.3.1.tar.gz 1480269 BLAKE2B 0d6c1afa3d13369c3e905c4e1fb4acdc553d1ec7c88e7bbd79a6d9f4f405bc89ee120008cd415597151123e9d366989c00f69ff3225eb3227894321e2398c9c1 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1
-DIST google-api-python-client-1.4.2.tar.gz 2289731 BLAKE2B 84dfddb17e3c30a64fd1d004188644410708647a147aa11eb3fd395dc2f13ebf1a802c095ee7de8f17301113d007da37cf48236ab3c66d11d6831b06ec8cdbe9 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5
-DIST google-api-python-client-1.5.0.tar.gz 2683924 BLAKE2B 91547e06d79b5287f1d437fc5753270be7bc4f79a38f06e4a8d20ae7123528e2516de4008d3f4b9f418ac51db50d71b25d061ec63543c147b51415b7bd218d27 SHA512 082a89e2e52dff449b6c4b6800503e337c5f2aa7ea2ca45a8373743a312d18d24ad87a486aed77b2e26075ba897f36e1129852dc30a139750e75cce5a1c25aa4
 DIST google-api-python-client-1.5.3.tar.gz 3622355 BLAKE2B 1187729581c9e852a4512fdfd557785791c8102d6796f6d02d212820f9fe89393574ffbedc1445416ff2fa876269f18adb162a33241f6331e989a31ccafec60d SHA512 3f58af0d1f165fa7e045d08a0bfc282855b40dbea16d310bbc4cbce76f631b6303738a396048efc8ea114fdff1164d1ad303148999d0ab0ba0d2cc91df9408b3
 DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfaadaef7812bb53d03eb1160f79a29bf73a180dae40bd2c5e7dceff0badaf5eda44718a06c4ec65fe993896a82c5fd12348f810ec2812 SHA512 ee906c2efb47469dc18dcfcb1edfad4346f61e88c1e7f73b60924b393c704e7033a5ff4f9a1965d0c29aa3a6bf25b60888e1d39366cbc1372861b49e79c9e886
-EBUILD google-api-python-client-1.3.1.ebuild 887 BLAKE2B e550f372c1eeb01b2a3a0fd7938848671f19f91462c0d8b9bce62d875faa5fe714746997ec30cb31dcac8cf46d7d59138cfcdcf80ec408c5c964fbbd06d7b69f SHA512 6f9d1dc267248ae28914596e8270f0b6f97139f7fd118200e0534af51676765238be6bd55fd76935f9e128eb8709b2a26bef2d312368b645b2b93d3953c7b6a5
-EBUILD google-api-python-client-1.4.2.ebuild 864 BLAKE2B 0f2778cf4238c4b54b1ced54e4eaf9a2eb62a5a5b8499a59800e2ece1eef407ac710225b3bf8611f8a581078da02532b51391d18056ba71467f94b21ab3c7a24 SHA512 9da0718c882fefa266f3114df01cef0fa53bb7e5927152eafd52d54395f4641fc484c909274273f1b1dd3d6a0feb44bb630ca875ea73fff5f82935a9490da234
-EBUILD google-api-python-client-1.5.0.ebuild 1082 BLAKE2B f9054b0751cb24b0ce2f36f50dba0b566930ffde50c67b115de03a7c85c88e33894d62ee7d1cce6a9114b42ca1d0fabe6ea94237fb2813a3ecd2c685419f190d SHA512 d5ddee43e96b7e65da2568879268cf2960b83182d7a95a84c187642b9a447b633a3ed43a7585ba6f92bc7ab22915955ae9fd08b9c625eb1780f81d3bab09ce0e
 EBUILD google-api-python-client-1.5.3.ebuild 1132 BLAKE2B 57e30f9ca7eda67b6f280e9dcb014968bbe539d69b9f8bec97a807976fe172d13bf3f8cd2ff3e686712c1fd02f75b83584c7c0004a662035f1614cdb598a9f42 SHA512 3a4fb461c807189da1d26e3388fff90ece1a30ca9b8bfeb51841d7f68a36c7e8494ec7589d0760ac15e6744a5e5d4ddd691875ad5aeeedb9cdf54d37d2f29ee2
 EBUILD google-api-python-client-1.6.2.ebuild 1194 BLAKE2B ea6981dd0cb48f90f0c07237c5ebf8a3927cc2d3ad7f37ca07faede40e8a0b92ea63bd9ed092937495e19e3a64a4583bc13dfa7527e7320c433f0db7ed66e199 SHA512 41384e153fb18d48229bb57b7413267342e8ea8cdd5a560fb6fbef8aefb540dec712b410edb4b02b718d022b3349c87028d0d452d7b18b718d0590c7dd829665
 MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
deleted file mode 100644
index b15e985f62a3..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +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 )
-
-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 arm x86"
-IUSE=""
-
-DEPEND="
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/uritemplate[${PYTHON_USEDEP}]
-	"
-RDEPEND="${DEPEND}"
-
-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-api-python-client/google-api-python-client-1.4.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
deleted file mode 100644
index b864d672f77f..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +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} 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 ~arm ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/uritemplate[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${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-api-python-client/google-api-python-client-1.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
deleted file mode 100644
index ee02f6711c1c..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +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} 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 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${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-apitools/Manifest b/dev-python/google-apitools/Manifest
index 2c5fbb193504..593d8f6b0d8c 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,5 +1,3 @@
 DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
-DIST google-apitools-0.5.4.tar.gz 255413 BLAKE2B 549aca8a2ef41f5f6de408efcd9ad3dc3c27fb9d0ce6c2c93794bd89355b0ed19499ad602aa79cac88d4aacf3c4e2820accbeb3e9c156caf3466bc36d5b0a7ec SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764
 EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
-EBUILD google-apitools-0.5.4.ebuild 770 BLAKE2B f073c844f94e9cf8527e5d3ae847e084ddac6499796cbdac32a8adc4b70751e20e3a16bf7453f985a70f62d5b7699a8be522162a92ba8e14d6cae13ebf3baa01 SHA512 5b441733cc1930ecc8cb571b87f78b13b848700fe299e64b0b4fa6ae10b7b4d74490aad4687bf306aec8212468654fd9fed0be66a64f90fb13ce4318fa9feb2f
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/google-apitools-0.5.4.ebuild b/dev-python/google-apitools/google-apitools-0.5.4.ebuild
deleted file mode 100644
index 7815253a3ade..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.4.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
index c06dad85b2e7..e9fbe9ad88b8 100644
--- a/dev-python/google-apputils/Manifest
+++ b/dev-python/google-apputils/Manifest
@@ -1,7 +1,5 @@
 AUX 0.4.2-sh_test-env.patch 754 BLAKE2B c44babbd7f1ccf7a9a6ed2f1885e30ec6287eb48900446ccebf1699a5afc0bcea6e5079716e8aec064553d97fb03c6e2a42286c8fb769e9eca552696633fb3bb SHA512 a8a84c65d08c7574f4e33c6e6c0b75d1153e192e86ec37c0e74754cc84f45b081b523ee2f1919f57580ba5bf6d849922dfaf62bafa00ef098cb1a835a929331c
-DIST google-apputils-0.4.0.tar.gz 80014 BLAKE2B ec64417271a922d16dfcad4e0965c17d5dba558782c7c4c20537927fb0b3e34680180952a159f71577d36877c68f3c0b98482142eca9d160a945b49ee2171782 SHA512 5dbbf50e9551b33d882557ef9385c64691dcff6d6c219c9ff6aea2dc73c8af6d03392b3088fe1fb4000979e227830a0e437dc347520488627657085c8ea23f5e
 DIST google-apputils-0.4.2.tar.gz 81095 BLAKE2B d99c2fe8081616ee2891718fc3d00d00bcd703f694b9419bfc7aaebe75ba8cd0de12e8461dbc6459c1b7b88abf6e7af89972368c565565cb5dfb810938e4e1d2 SHA512 d7579ec461292bb01ad5b8e1b09e161c66af0e85361f43f6065b837c90bddb9711a2d56db2b73d780dc25945375d4dad2f646507512b9acfeefd517613feacd4
-EBUILD google-apputils-0.4.0-r1.ebuild 1419 BLAKE2B 2ae1ec207b136fe1d234258809a65f3d1f7ff328e300c7359d8be55dada898acda9cfc87b2d3a641f6eead832bb0cc7ff81aa604c276718493ad34a52d4e0a98 SHA512 3d7618b86dd42de706c747840f206fff16e7048cd88a565b50076016115f3d8c30094e339247294f36e2f880b55dd2d97f600349e11201d9f903cbfb17d105ac
 EBUILD google-apputils-0.4.2-r1.ebuild 911 BLAKE2B 332c36d235ad6a2f1f3421cba287059ef3d238a8e45c059f12cf213226864859de4c12b2ef745b0823718438cb18049d58f80360a539c009d114f9acec1fcb08 SHA512 002ac6d13ff7fb217d0bac24524cd5280ffc7717181a847a486e2f6e5f18aaddb663297e9260d0d5574016ae7476e716877b07478e389dc86f457db3415c4e72
 EBUILD google-apputils-0.4.2-r2.ebuild 1110 BLAKE2B e75e973ef26c509467bc7bc0483395953bcb941c301a38c079b3eddc548c979f0dbb6b4d906ce7ad7573888370b142f50f127233c587d6aa7e9568b57240998e SHA512 6321eeb225b0fc048c149e198cd8d6fa651bd590a3a6058d104c14236610126e0cbc18adcfd518932ba92695eee49f677a54708318f89c9e1dfb155c32be1538
 MISC metadata.xml 392 BLAKE2B 5282cd7dbe47082409723576d76c9a8b9126ff1c9c6adca6ea6c1d07e28169a01725cd6e24e407392c42703ed848626feaec4e134ba3bc0731f9488f8593613d SHA512 7ccba7bf0fcdb9da27053154056eb947ad07ce01db7ecc41f5a7e58bf75d15e71ce08ff420ee70b8169e5ea44d48d04d529acad65c8280785e0bd21a21bbcb9a
diff --git a/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild
deleted file mode 100644
index c669a1979113..000000000000
--- a/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# Doesn't yet support py3
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for building Python applications"
-HOMEPAGE="https://github.com/google/google-apputils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh x86"
-IUSE="test"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/python-gflags[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/mox[${PYTHON_USEDEP}] )"
-# version borders needed are already confluent with versions in the tree
-
-src_unpack() {
-	default
-	chmod -R a+rX,u+w,g-w,o-w ${P} || die
-}
-
-python_prepare_all() {
-	# https://code.google.com/p/google-apputils-python/source/detail?r=12
-	# This version bordering is long out of date and wrong since end of March 2012!
-	sed -e 's:>=1.4,<2:>=1.4:' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# These yield 2 fails which are in fact expected errors run from a shell script!
-	# They seemingly have no immediate mechanism to exit 0 in an expected fail style.
-	for test in tests/{app_test*.py,[b-s]*.py}
-	do
-		"${PYTHON}" $test || die "test failure under ${EPYTHON}"
-	done
-}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 9ceaa1a3e6f8..0ce23046149b 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,8 +1,6 @@
 DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84
-DIST graph-tool-2.22.tar.bz2 15100673 BLAKE2B 487cf0de763288a9e41d227496f2f30b1aa56913d79c2283097561162eea17758cd51cb245d462fba0f6ced46e109d54e5852c7b35ef165288fb1168c69c45e4 SHA512 e5ffb6913ba76c1b3dea597950b8d50edd55cb997bf8b02c105ffab314b4978ac861db0c57507e51598f731b6b8fa9f1251e21d5feb9eb89158bc4c1921dc51f
 DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36
 EBUILD graph-tool-2.19.ebuild 1848 BLAKE2B 9da9a76345adb0d3efc94ff27603634f73397f758a255c16dd84f57ae94bcfbe092878e6f72a4d7dca818de45c75768be853048db6e4fcef163c2074c4a772b1 SHA512 344223b9db341f944a0ece4c94b9fec1dba2bfa0e61389fa991401eb1132db418f1547dd89904a8de9cf9cbfeaa050b8e9c1c15ed4f0455a2d440b19389a282b
-EBUILD graph-tool-2.22.ebuild 1832 BLAKE2B 0c41c1cf6a811ae3fda42f479074f940ff3c90dfb51ac82d9d7504bd8bac17500783d76f380359eb74936afe1e7b5e66a8c61b99fbf019e55cd8e2799357387f SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127
 EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 0c41c1cf6a811ae3fda42f479074f940ff3c90dfb51ac82d9d7504bd8bac17500783d76f380359eb74936afe1e7b5e66a8c61b99fbf019e55cd8e2799357387f SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127
 EBUILD graph-tool-9999.ebuild 1832 BLAKE2B 0c41c1cf6a811ae3fda42f479074f940ff3c90dfb51ac82d9d7504bd8bac17500783d76f380359eb74936afe1e7b5e66a8c61b99fbf019e55cd8e2799357387f SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.22.ebuild b/dev-python/graph-tool/graph-tool-2.22.ebuild
deleted file mode 100644
index cf9f4302985a..000000000000
--- a/dev-python/graph-tool/graph-tool-2.22.ebuild
+++ /dev/null
@@ -1,82 +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 check-reqs python-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
-HOMEPAGE="https://graph-tool.skewed.de/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+cairo openmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
-	cairo? (
-		dev-cpp/cairomm
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
-
-# bug 453544
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
-	configure() {
-		econf \
-			--disable-static \
-			$(use_enable openmp) \
-			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index c8d7306e9a68..2cf8daeb591a 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,3 @@
-DIST greenlet-0.4.10.zip 82616 BLAKE2B 6e768e94f13db018a11c553288c06d1481eab5f3135ac9c37850bc34800df7fedc9c437a55be7afcd160d13284082b562d1a6d321dd2ee465b5db38f4217083c SHA512 7fc78b14dca079f838647fd99878850cf9e83af781c985362146a11f71c5a700fbac8148273cd1c0ec4ac6ead4cf5bd389e001b8fc1225e87e9b51919d7ecc6c
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
-EBUILD greenlet-0.4.10.ebuild 1088 BLAKE2B bff68e7a05fdc947842ea96e984b83c05d3bbecc628525dfbb8a776612245395143d4ce606b389a4ef95b0cb09ec1ba03d4b942e486e865e5cde0cc81b2da5ec SHA512 faa86a437f85ec7571ad6cbd0f9c73eb762d978361e05351ba6b858a346feba213e2f95a0a7236f0c6a293ab7fee5e40e71b93a7b7428228f79024f1a8c723f3
 EBUILD greenlet-0.4.12.ebuild 1083 BLAKE2B 8e890585789733be8206bffc6fedc4c9ed946862e31f3c28ae1dda2cba338a22657b2029d5e8d9017168ccc0c63eabaecef92d308e295ab2bf2e40139fbf7529 SHA512 ae462cae82025d263d5ca162e2fd2eda8ab5f2759e81b81c4b81dc04d26f4c52a2af5a93865dff243ec90df02a047e9074ac5a5fd3c1068e25445b5df215dade
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.10.ebuild b/dev-python/greenlet/greenlet-0.4.10.ebuild
deleted file mode 100644
index d066407ec748..000000000000
--- a/dev-python/greenlet/greenlet-0.4.10.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
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.python.org/pypi/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-alpha amd64 arm ~arm64 -hppa -ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || 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/h5py/Manifest b/dev-python/h5py/Manifest
index 0190f73fdcbe..3ea805b0c589 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,3 @@
-DIST h5py-2.3.1.tar.gz 1072766 BLAKE2B 40c5739a72e381cd5b7fcfcb1c7aaa771f2ba0c8145f65e6310d6181fcb5b8bdb5d3f14828f4ab164b5d1f16194e79000b1af55ffcda56890fe2631b11cc544e SHA512 f0da1d2ac855c02fb828444d719a1b23a580adb049335f3e732ace67558a125ac8cd3b3a68ac6bf9d10aa3ab19e4672b814eb28cc8c66910750c62efb655d744
 DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
-EBUILD h5py-2.3.1.ebuild 1125 BLAKE2B 208240a09d8223261494c397e6628e70539a11d03e48e6102bb97009e7c46cabf9a188cbfdeac36362b90da2183aadf58c48c843762a3b8aa9ee74ea66bb4a82 SHA512 324df192b0734bebddca783c9fcf469a1a09803dc104235a2f2987ff1d11994f770ef482f47cf055ca5aec725f5924cb1195bf563dc8c22ceb119ae779c1412d
 EBUILD h5py-2.7.0.ebuild 1383 BLAKE2B 97660943e83ecee56fc008a312482ea9dae7be654ded10855c3dbd1b7648ab8edebe7d01f086ad42d46773ee19a28e1c2adc3aee7500020fb81a35ecdd695113 SHA512 f7687d5f281f9892660784a1f47192212cba546ee85cf1499c2a6d75efdcb9622d71884422f03395830746026630ce5bdec74c32a1e806c05d42c88ae6fcff7b
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.3.1.ebuild b/dev-python/h5py/h5py-2.3.1.ebuild
deleted file mode 100644
index 29efd5b8b5e9..000000000000
--- a/dev-python/h5py/h5py-2.3.1.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
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test examples mpi"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile --mpi=$(usex mpi yes no)
-}
-
-python_test() {
-	esetup.py test --mpi=$(usex mpi yes no)
-}
-
-python_install() {
-	distutils-r1_python_install --mpi=$(usex mpi yes no)
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 7fc57c8f9eb7..9d0df76e8816 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,7 +1,5 @@
 DIST html2text-2016.5.29.tar.gz 46879 BLAKE2B 0e7ccae7ae4d90fb202d9fdb8edd81f74b204f81c2410f345eb923fe610f61fab6ba71bcc95138fb3706ee51007a2c72c76497cee48818032934e7f809fd46ae SHA512 58b71fda6ea6fd1a71dec757c91cf342265a2c89ff5c45e752436068419fb6c1faa1ca0d5a6baafaaa60186a85aefdd840989177ce30e55bcda1c6209fc375be
-DIST html2text-2016.9.19.tar.gz 48003 BLAKE2B de5080668002db82a82e01ba4b347a73f6edc1ac34ff94b3f20006aab3a7e5b2af6022fe68c6f8fb330b6678f2f6480a7608742a14dace6423dcbfed0c024813 SHA512 bfa7d051e49bea592413bc6e335aad34f6b10d3e718170e709dd9d4bb55cc26b7da4c3f64f512022efe41df80a1157b542ab2ca897612b702f9285cef3b44f40
 DIST html2text-2017.10.4.tar.gz 50527 BLAKE2B 96b7060761a629cf4313104323517c4a9070aabfa02be43e80c89b56b92329785817abc7ab9fef4a8537cbde4a797926d3c1d444c11f3db6112074a31d8a8e61 SHA512 c7f9b765572b5eac72837aa757f0be07df0270b49f9b3a3ec8c3c65ff929505166b0510c106116ffdca484b56120b6c162f86b600d88a5a35e86d06cd6b6fa19
 EBUILD html2text-2016.5.29.ebuild 959 BLAKE2B e505909351f72a318d9fa566907ad91bc25e3ad43d3ecc1d5a1ad7db852ae386409bba2a111700365f9b55c8ac987af196ff8168343395d346bfa6253faff7c0 SHA512 758d2bfc792069c5ee9ed436f81861e9173e39865e0ab3c8ffe74d78a4c7cac983772177ae6e11103e073dfd86389a34243e97bf8310694a592b1cb32bb1dae5
-EBUILD html2text-2016.9.19.ebuild 968 BLAKE2B 564581c5ce312259291f1995f03eab83e2a405c0dfba87912b4c855d3884f33ba34ebb5a254029544d41a73af57143c588c4a7c3d71339135d3c255f3f175812 SHA512 ea760f8673819ca00a85e7283b71e4acc43b3024f6b4a87b8f8640ebc44fd210a5dfbf838aaea1892abba40d830c52199d92b91e6207da90fb23885a5d9defd2
 EBUILD html2text-2017.10.4.ebuild 932 BLAKE2B b81b383edb4ff9c9256e82e51ec972f4cd1e9ab9a96c4a913d203202f09ef04fad14a71760f8499086dc812afc40a5aa4858c89c8590a6b215101d65b5d292e7 SHA512 3e4e0ded8806868b1af581dcf21d5eb74427b774a729cc39b955307ac59d6b8c107d63a429df6ded169c89e21a53f173ecc2f800a9c2544992c2a2e1ac297168
 MISC metadata.xml 332 BLAKE2B 2df3c377697f219f255f69968f31426f716334507a858fc4ea27f0dcb09ab1f7b2d98d4da2760c94ced1747ad908896a6c7c6cc1cd89fb5877707b14e37f825d SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc
diff --git a/dev-python/html2text/html2text-2016.9.19.ebuild b/dev-python/html2text/html2text-2016.9.19.ebuild
deleted file mode 100644
index 6e7cf55e98d4..000000000000
--- a/dev-python/html2text/html2text-2016.9.19.ebuild
+++ /dev/null
@@ -1,35 +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,5,6}} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/html2text/html2text
-	https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 3c43ce38f515..fedc1220527f 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,8 +1,5 @@
-AUX html5lib-0.9999999-lxml-3.5.0-backport.patch 4654 BLAKE2B 218ead350fa0d9a0191207c6d7c60ce10103ff3a453302e52a9eef9f0db20e98a371f6b6759edf3fca8e027b7fd491a4e1ecf8397f4e78588cb6dc2ce0676375 SHA512 bcaddd8dfd71c943b472028b7c21cf913d58e6093d5f15fc280597d3d01e8a7d96a27f976e5b94b6289d0ea6ed4756abaf1bc382a4c48b95c65aedd2992aed05
-AUX html5lib-0.9999999-python3.6-sanitizer-re.patch 2591 BLAKE2B 4abc5adec94c93cbd32ae515e2b5a6f8d783e51f7ea800329e78f695fa2c5682b33d52a11cbda12d2ecf1e2554ac35577f011c245757efa24a669fedfce6cb48 SHA512 c95e2a4a4f1fd1e376a6af7710c6ed94747e54de8d1f1c6233f56405405011c2f9fcebb93e5dfd19589148387a62abe856e7d55b0d0014ca931b337e825c35ce
 DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
-EBUILD html5lib-0.9999999-r2.ebuild 927 BLAKE2B d1719d772dae2203b98b7f8e19ecc4df8973d36a233aed31764e6f04a7cc94ce79bcbcc0f8890f41e427c1801aefc975b1f80478f04fae005e9fcbdfbf29a94c SHA512 adb8a68a96e5d785dfb9490209f0c54e549a322eabc62f8887021754dee30de5df6bcfbb060220d6cf483ac9ad2a1fc9c77db4beaf794f1c1404d0d039e1c716
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
 EBUILD html5lib-0.999999999.ebuild 879 BLAKE2B 5c40d502b03171403ab0bbee8e24890cfcef366e537d83128ac6464675162817db53b089b1c6866f2296ada8c55fe6a842312b152faaa4391a43067ca5736db7 SHA512 b97ad3d5d8953fdfd5527a4f04e67c67eb9131d54c3d5155600a03f115c45855853e1061f5ab9ac6f747ed980268258726ef3ad6aa15736b400e95428090dc55
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
deleted file mode 100644
index fecfab9a4fb4..000000000000
--- a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 46046c0f7125911ff8205f09a7574573bb953105 Mon Sep 17 00:00:00 2001
-From: Geoffrey Sneddon <geoffers@gmail.com>
-Date: Mon, 23 Nov 2015 15:17:07 +0000
-Subject: [PATCH 1/3] Make lxml tree-builder coerce comments to work with lxml
- 3.5.
-
----
- html5lib/ihatexml.py                | 2 ++
- html5lib/treebuilders/etree_lxml.py | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
-index 0fc7930..b5b2e98 100644
---- a/html5lib/ihatexml.py
-+++ b/html5lib/ihatexml.py
-@@ -225,6 +225,8 @@ def coerceComment(self, data):
-             while "--" in data:
-                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
-                 data = data.replace("--", "- -")
-+            if data.endswith("-"):
-+                data += " "
-         return data
- 
-     def coerceCharacters(self, data):
-diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
-index 35d08ef..17007e3 100644
---- a/html5lib/treebuilders/etree_lxml.py
-+++ b/html5lib/treebuilders/etree_lxml.py
-@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder):
- 
-     def __init__(self, namespaceHTMLElements, fullTree=False):
-         builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
--        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
-+        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
-         self.namespaceHTMLElements = namespaceHTMLElements
- 
-         class Attributes(dict):
-
-From 1c22e1ce93dd4acc81a66cfa03cf9720fbd741c7 Mon Sep 17 00:00:00 2001
-From: Geoffrey Sneddon <geoffers@gmail.com>
-Date: Mon, 23 Nov 2015 15:35:21 +0000
-Subject: [PATCH 2/3] fixup! Make lxml tree-builder coerce comments to work
- with lxml 3.5.
-
----
- html5lib/ihatexml.py                | 1 +
- html5lib/treebuilders/etree_lxml.py | 7 ++++---
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
-index b5b2e98..5a81a12 100644
---- a/html5lib/ihatexml.py
-+++ b/html5lib/ihatexml.py
-@@ -226,6 +226,7 @@ def coerceComment(self, data):
-                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
-                 data = data.replace("--", "- -")
-             if data.endswith("-"):
-+                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
-                 data += " "
-         return data
- 
-diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
-index 17007e3..c6c981f 100644
---- a/html5lib/treebuilders/etree_lxml.py
-+++ b/html5lib/treebuilders/etree_lxml.py
-@@ -54,7 +54,7 @@ def _getChildNodes(self):
- def testSerializer(element):
-     rv = []
-     finalText = None
--    infosetFilter = ihatexml.InfosetFilter()
-+    infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
- 
-     def serializeElement(element, indent=0):
-         if not hasattr(element, "tag"):
-@@ -257,7 +257,7 @@ def _getData(self):
-             data = property(_getData, _setData)
- 
-         self.elementClass = Element
--        self.commentClass = builder.Comment
-+        self.commentClass = Comment
-         # self.fragmentClass = builder.DocumentFragment
-         _base.TreeBuilder.__init__(self, namespaceHTMLElements)
- 
-@@ -344,7 +344,8 @@ def insertRoot(self, token):
- 
-         # Append the initial comments:
-         for comment_token in self.initial_comments:
--            root.addprevious(etree.Comment(comment_token["data"]))
-+            comment = self.commentClass(comment_token["data"])
-+            root.addprevious(comment._element)
- 
-         # Create the root document and add the ElementTree to it
-         self.document = self.documentClass()
-
-From 235a6d7ac7e0a3e2b431766e051094c2d3110ba3 Mon Sep 17 00:00:00 2001
-From: Geoffrey Sneddon <geoffers@gmail.com>
-Date: Mon, 23 Nov 2015 15:42:12 +0000
-Subject: [PATCH 3/3] fixup! Make lxml tree-builder coerce comments to work
- with lxml 3.5.
-
----
- html5lib/ihatexml.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
-index 5a81a12..5da5d93 100644
---- a/html5lib/ihatexml.py
-+++ b/html5lib/ihatexml.py
-@@ -226,7 +226,7 @@ def coerceComment(self, data):
-                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
-                 data = data.replace("--", "- -")
-             if data.endswith("-"):
--                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
-+                warnings.warn("Comments cannot end in a dash", DataLossWarning)
-                 data += " "
-         return data
- 
diff --git a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch b/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
deleted file mode 100644
index 2fbef2ad0b9e..000000000000
--- a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/html5lib/sanitizer.py
-+++ b/html5lib/sanitizer.py
-@@ -203,7 +203,7 @@
-             for attr in self.attr_val_is_uri:
-                 if attr not in attrs:
-                     continue
--                val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
-+                val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
-                                        unescape(attrs[attr])).lower()
-                 # remove replacement characters from unescaped characters
-                 val_unescaped = val_unescaped.replace("\ufffd", "")
-@@ -228,7 +228,7 @@
-                                          ' ',
-                                          unescape(attrs[attr]))
-             if (token["name"] in self.svg_allow_local_href and
--                'xlink:href' in attrs and re.search('^\s*[^#\s].*',
-+                'xlink:href' in attrs and re.search(r'^\s*[^#\s].*',
-                                                     attrs['xlink:href'])):
-                 del attrs['xlink:href']
-             if 'style' in attrs:
-@@ -257,16 +257,16 @@
- 
-     def sanitize_css(self, style):
-         # disallow urls
--        style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
-+        style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
- 
-         # gauntlet
--        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
-+        if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
-             return ''
--        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
-+        if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
-             return ''
- 
-         clean = []
--        for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
-+        for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style):
-             if not value:
-                 continue
-             if prop.lower() in self.allowed_css_properties:
-@@ -275,7 +275,7 @@
-                                                 'padding']:
-                 for keyword in value.split():
-                     if keyword not in self.acceptable_css_keywords and \
--                            not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
-+                            not re.match(r"^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
-                         break
-                 else:
-                     clean.append(prop + ': ' + value + ';')
diff --git a/dev-python/html5lib/html5lib-0.9999999-r2.ebuild b/dev-python/html5lib/html5lib-0.9999999-r2.ebuild
deleted file mode 100644
index 5b23d984fc3e..000000000000
--- a/dev-python/html5lib/html5lib-0.9999999-r2.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 pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-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"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lxml-3.5.0-backport.patch
-	"${FILESDIR}"/${P}-python3.6-sanitizer-re.patch
-)
-
-python_test() {
-	nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 1cd2a94f47e6..c9c992313ef9 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,8 +1,4 @@
 AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d7efe2ae587808c7d9ce23ad0f8b507f51751054cd7079bfca55f9b3496b4806180f28da9acf0dd812ff16f14d9bb03749e7 SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f
-AUX python-httplib2-0.9-cve-2013-2037.patch 1166 BLAKE2B d785cebfad7555a8ade3ced9c0fd36293fb89400e279f72e2a22e1b41b900d91d6892679655a01a48326002a036b00479d9f703ad0819868b835504ec7a0ea45 SHA512 10a3ac8ae9be7796c3f933694081c36c7412016fabd80e366703ed4622cad47463a523e8b7c30548112f885243887eb6d389218ddfaad99de8181ea5ffa9b5b3
 DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
-DIST httplib2-0.9.2.tar.gz 205165 BLAKE2B 8bcd1b5786ef2bac51d31766f2477e05cb942feb5edc829ef8d13cd256169da3fb812880fe422e61c3c14d268833e38686452916b5cfc7e0ed1cff17bad6dcfb SHA512 cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8
 EBUILD httplib2-0.10.3-r1.ebuild 943 BLAKE2B d887b87d4f219deaaa9308e1d701cc9e0d8bae64f013c52fee0ec369eb3e2720530c2b75ab6a32146cb354ecd2c974063814d4c9ad930fe7aeb7f09cb94d0902 SHA512 46ed397ce0c0b90c03604ee66f0352ad5284b982fc2973bbafdbc9a3c6eb4ef7fdadd333322ba3e3b60ec6adade473c3b2373136957cc01443fb99a2f4e4f70d
-EBUILD httplib2-0.10.3.ebuild 858 BLAKE2B c494d2f793ff326bc6ffca616d8dce4b2f32d9a2fc7c7e84c2b345db29df95ed81df411abf94cbadcfa68900f520b18fbbc1b3a67d5ec3841b78bd3f1c08090a SHA512 fdd5cba5008f9141881d5607f25787b73bebcfb1d0166018dd064addd636524f637d8d60a58970c10fdf8cc43281c10f3f8a9e3aa2d8f1d83d24f9c1adde941b
-EBUILD httplib2-0.9.2-r2.ebuild 918 BLAKE2B 58c3c8daef259042dbc5a3c16d42ebccad5130b9e22ef539f57a51105c1c5479c41705d00c782f9b6ba7266154e5b1671ee657ceca66b5d09460a8041eeef7d5 SHA512 8d225e3737f880defc870b78ce0cdf116dcab5880622bb5794af03b4f1a4006b0d768edde84304595c4f2af5aadde9f91043040c5d4dd248482f87402e14d7da
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
deleted file mode 100644
index 6a09337b1993..000000000000
--- a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
---- httplib2-0.9.orig/python2/httplib2/__init__.py	2015-04-03 13:10:43.401035131 -0600
-+++ httplib2-0.9/python2/httplib2/__init__.py	2015-04-03 13:10:08.470685647 -0600
-@@ -1042,7 +1042,7 @@
-                         raise CertificateHostnameMismatch(
-                             'Server presented certificate that does not match '
-                             'host %s: %s' % (hostname, cert), hostname, cert)
--            except ssl_SSLError, e:
-+            except (ssl_SSLError, CertificateHostnameMismatch), e:
-                 if sock:
-                     sock.close()
-                 if self.sock:
-@@ -1052,7 +1052,7 @@
-                 # to get at more detailed error information, in particular
-                 # whether the error is due to certificate validation or
-                 # something else (such as SSL protocol mismatch).
--                if e.errno == ssl.SSL_ERROR_SSL:
-+                if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL:
-                     raise SSLHandshakeError(e)
-                 else:
-                     raise
diff --git a/dev-python/httplib2/httplib2-0.10.3.ebuild b/dev-python/httplib2/httplib2-0.10.3.ebuild
deleted file mode 100644
index a12c08521b0b..000000000000
--- a/dev-python/httplib2/httplib2-0.10.3.ebuild
+++ /dev/null
@@ -1,37 +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="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2.7 ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
deleted file mode 100644
index 063a7624efe8..000000000000
--- a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,41 +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="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/python-httplib2-0.9-cve-2013-2037.patch"
-)
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2.7 ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 06b0b24fe3de..dcbfef04e7ed 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,5 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
-DIST hyper-h2-2.6.2.tar.gz 169942 BLAKE2B 1b2872be60478d75c3da925ffbc678c210c323dffb1cbcab16793d3ea15c864b0c0d638921fa2720b7314b94f2bd1e894bcf9abdaadfac1d44c6b448a86fb1ea SHA512 4bbdb26fabe2ee72e1b22e91dcc2a727d4b5c4e2cc465aaf45a15d004062740db87ef5f35f369fd423cdd6fdb61475f0dc423cbe7cec1bc52ddbe8a7488acf1d
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 EBUILD hyper-h2-2.5.1.ebuild 916 BLAKE2B b0116a6715cffe614286551448d5d9334188aa960e02f8960bf69ca1b30f296178509090cf539dd30fe2aa3883e2d0e4c5b3ee05c2d443ae32b78cdc18df0372 SHA512 76b56645b99790e441bd9b22e12b4056fedc59f18bfc0217cabbf892125daca4c3b1764b18590bd536f4a18b81c6c30010dc0287b6acc6c3373b3d9998c97b20
-EBUILD hyper-h2-2.6.2.ebuild 910 BLAKE2B 56b08d543f61aa7e68ba1ee6fa702bf6d654d806b60683429cd70ae479d22e5592bd20e0c9730bdafc348e88596a085a69b6856740355e9c6233b7be936f3cd0 SHA512 97999129a918910602e18c8ca3cf975766ae0a6d08f0530f357fe94389a46b1cdd4a0fa066d801b84a70fb0ef165250e66d11aeae61b844a8e5e2a81329922b6
 EBUILD hyper-h2-3.0.1.ebuild 900 BLAKE2B 2138227276b67c34109701e8a144e9e3ff33afb32be975222d739ee49ccbb828fe849dd8fb68a92cd9e4f7cdbf7ab421c6938630d07356fcfc23b6e98cd11317 SHA512 e133d3f96831a94d3ac533fb9d6de01a822010671a8d108571ab59c2c94e23d3d08e097ee5f463856efe7817bb2398faddd6d964602e785aa94cd44be76d3345
 MISC metadata.xml 795 BLAKE2B 49ad10d31e9025b788bb08cc3876e168b8bec83297deb48d488d42bdba80717e868dacf83c1477c6071ef4a29451339bc9a5a818d75d1b8fdf4acb673c745e46 SHA512 93236434859273e9d28452c192776e52b22897c7d737807dee35b2d9375e1c45ac42e260b5ab84e8967f4f06dea117d4a82a6476ee2e580f656a0afc9a7f5f31
diff --git a/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild b/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
deleted file mode 100644
index f8e40011f0ab..000000000000
--- a/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
+++ /dev/null
@@ -1,31 +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
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-4.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}
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index c15bf6d23fb8..f0e92f3d7429 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
-DIST hyperframe-5.0.0.tar.gz 17691 BLAKE2B 4dc4a028025f9e714e400fb89489956355378eeffff637b32f9fb387e110c31e29dbca8b58fe475e0cb1772ba648ca6b7ed23f0af7f2e5ecaf45128f1407284b SHA512 cb971bfc35938c3b76410432a7b3a677e25e44372fe3005351191e4bbb0fd11564f0e60765d22a96b565e7cc2ac80ea65447673bff2bee36e502bcca89a76491
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 EBUILD hyperframe-4.0.1.ebuild 499 BLAKE2B 1791b20feeca030955555a4c300154a39db1293bd65545cd19ba7f1f92635c1807208a4414b501e98d37eec520bb04eca32a1324defdc46c7891a4cd51945c91 SHA512 b559eadd904b9fa9d237155b244c6f4d631f05e6d566286ef87693f9c085df12ffbf034b2112e7bdd73a8d842896d1953fb541ae0a1d45e61c24c2eb09fb7e9d
-EBUILD hyperframe-5.0.0.ebuild 493 BLAKE2B 7be547312d37d810fec97198e4442eb0c55fb197a4fe734507d2f1f87344ef71dcf9e142d2db47cd1c5bba1292267b9c7cc167ca614364eda2cee1a38ccf23e1 SHA512 82942760c801e98f7ed92998383348da49809008889a0fc2ab7afeab6acb3dd5586a4878e5401f6f7ac633edf899c330f403572e8f8592d8901cb441d6586e03
 EBUILD hyperframe-5.1.0.ebuild 506 BLAKE2B 9fca216157fcb9224bc93f7594536e79cd154c9a5cd3637a8d31288ea6caebdde86e8e2866131f468e9349ee6feddf8c853feaec75b8c95013940097eda80710 SHA512 398bb1fa45762caba3ca4dfd14b49e06e93f3730cd102de4916501bfe64c6b215b04c6cfa3da6a5d80f2a877ed18df3eeee451b0935891dd674334b27b9aab43
 MISC metadata.xml 750 BLAKE2B 8f44d19636a37b3eba5e531093149564ec40a2890bb5118e830a6b6eac8ef4d5face3e004dec560f06534f688bc87db85516d79a9e967e54cb9a3e7c4178f104 SHA512 cc327a1e5cc34d38519d01deb7bcef7fbdb96f24bb426781979423020afc761857223336ed3d76eabf96ddfd26b0a212a9e0b7222e832d781db4f580b99cbedb
diff --git a/dev-python/hyperframe/hyperframe-5.0.0.ebuild b/dev-python/hyperframe/hyperframe-5.0.0.ebuild
deleted file mode 100644
index f53f008741b5..000000000000
--- a/dev-python/hyperframe/hyperframe-5.0.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=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 0588dc08a38d..9cba1d145ab3 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,13 +1,7 @@
-DIST hypothesis-3.31.1.tar.gz 464365 BLAKE2B 651993c8b821f42669b96c855c6c2d43c07d9059f2752b4590aeee59b8c50bc7904ab1e261fa18badac4c4f5542b29cc87b35c30f1080641db02aa94651a9ec3 SHA512 2bb0bcf1030374a17d0002901a9ffeb2bd522917428989206a3398e13dc0523703b9b39331cc503ee4d815ad48dca4826cc49379434767803373aa7b81a2625d
-DIST hypothesis-3.33.0.tar.gz 467424 BLAKE2B b963fc0bf953974526f48e0ddfb851547904d5788fbad513aafa9dd9e93e30c2d39e435e68b243b6a76b3b8d429198894757832c1497f98f4dff62b93f25853e SHA512 3e89fa183381f2df556016ff4af17d2731685b019aed74d5f8dccd53ad262dce107f83f105b7e950a579ef247cc9b8336f15ee321292522118fa4c3487a21138
-DIST hypothesis-3.34.1.tar.gz 468030 BLAKE2B 5e5e320dc201c27199289b4f798a4feff0e40471b7d2c66adeb8e1b2ddbab0ccde111bb285a7cd1b0fb6b264ccd8f45cd3cda9ea721145c317bf96e840d4ae41 SHA512 d061c67551c7f877fd7b046ab8164fd01f73f8b013f257817a4e85177f0b8b1782d333d79b492e07771ecdb54ca4451fbcc6271cae19f9a9040160cc45db0644
-DIST hypothesis-3.37.0.tar.gz 469019 BLAKE2B 4b86aa2c4a9f0cde5abe5442d1db0060a6b1b4ca9bfdf4dbc1e875a2253a0e82729084f26bb3f6b2c77f712fe22a9e2b332f0788f6fd658821e1048f60c4b1fb SHA512 41dae6f4d9bbddc89fc174e3cb3a9f09d16bfc1903ab75980a243614505eeb792bb00bc2b803e2272b2d6fce901f250e0f82ea9ea647ada868019ce01aa98618
 DIST hypothesis-3.38.5.tar.gz 474087 BLAKE2B a3182701463e03383cf4d5fb16605d494c5339a23ea77d789d27eaaf576ee3c2c81a7ebfcb4641b15b9c19755d85a6f0d36555f8091bef8986e8afb290eedc85 SHA512 bd13bda0adf2fc1629c41c6b5b63744f1b33b0b9cfbcd4b78c73b8ab9cde2db50e2c084216c4123f93efc2355d4d45d3d6e51b079d8722341deb5df24fedf6b1
+DIST hypothesis-3.44.7.tar.gz 403113 BLAKE2B a929322db86a9f769dff43c668609ad18407d1e3456cb1b0057f846d1e3c807f1198f23d6a182b48fc39b2e716780d07433cfffbc636de9b9456e4f335e07b60 SHA512 07c21480457c70c2d57e7036296a4c2c418f0380608f28790f7c2269d003b227a2038fbac8b8370e3178bb77fea8ce2e13bb6f14296486ea6eae2fdef5870567
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
-EBUILD hypothesis-3.31.1.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
-EBUILD hypothesis-3.33.0.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
-EBUILD hypothesis-3.34.1.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
-EBUILD hypothesis-3.37.0.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
 EBUILD hypothesis-3.38.5.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
+EBUILD hypothesis-3.44.7.ebuild 1100 BLAKE2B 8ed2896ca77f6921d9314c5323833ebe52491a4ca820f37b5af5d44e524eda6aab8b35b25b6b6b5202161f5e2c88b013438f0f2370cc6617d5834eff11465f42 SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c
 EBUILD hypothesis-3.6.0-r1.ebuild 915 BLAKE2B d1e7c10682663fd069161e8a4a0f31f5d63038ed7892ab58ed2f56783f458d8a9c77314817c98ead0420db51c6209423914c39b3a40332d2003544ad1a3df59f SHA512 83ab953c3eca8c1e3672eec5d4acec86566cd2eb6151f7304ad57f8dd9ff485e40322ef4dc30b9b7444799bd919be9b3b5d8165c663a0f4e10d0e69e90eab6ba
 MISC metadata.xml 386 BLAKE2B 565f8e88bccb4c39cf4087466141bc760e4f7576d5f91d436306d9a7d448ebd7ac89add1a4f6ea30c6937aa3a3c1b059e377afeb3622b2f521b9b5d1cdd00085 SHA512 e0ad6c17078a2a06250d83b93484b2b449fb6924a7f083121f7368e7032ea970489067f8231b5d27edd9875434c32dc02801d01d4ebd8bfba33b3761429e5975
diff --git a/dev-python/hypothesis/hypothesis-3.33.0.ebuild b/dev-python/hypothesis/hypothesis-3.33.0.ebuild
deleted file mode 100644
index 4869c0b7b9eb..000000000000
--- a/dev-python/hypothesis/hypothesis-3.33.0.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{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
-SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${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="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}-python-${PV}
-
-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
-}
diff --git a/dev-python/hypothesis/hypothesis-3.34.1.ebuild b/dev-python/hypothesis/hypothesis-3.34.1.ebuild
deleted file mode 100644
index 4869c0b7b9eb..000000000000
--- a/dev-python/hypothesis/hypothesis-3.34.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
-SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${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="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}-python-${PV}
-
-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
-}
diff --git a/dev-python/hypothesis/hypothesis-3.37.0.ebuild b/dev-python/hypothesis/hypothesis-3.37.0.ebuild
deleted file mode 100644
index 4869c0b7b9eb..000000000000
--- a/dev-python/hypothesis/hypothesis-3.37.0.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{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
-SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${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="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}-python-${PV}
-
-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
-}
diff --git a/dev-python/hypothesis/hypothesis-3.31.1.ebuild b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
index 4869c0b7b9eb..4869c0b7b9eb 100644
--- a/dev-python/hypothesis/hypothesis-3.31.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index c8b2c711db9c..6849db639f52 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,7 +1,5 @@
-DIST idna-2.0.tar.gz 135150 BLAKE2B 84cf12e2889532a5c175659a927695cfa7280a64dea394cc67004c03c8089d339979e4da391edf3214978d474d0188688b5eb9a96f65651b476301961b9aa5ff SHA512 005f88e954f13ace584ced510752da58d1cb16ebfbeee10aeef5bec57b3c61a3a5d7ce0bb50deba6dc90b412607727bf94a95a785e91d6528cd8633961c142dc
 DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640d2c9d9b7ea05985f9eceac122bb9e5b30b2f22648506580202a187f95513fe5ab0af6632917335f2eda0 SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835
 DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2
-EBUILD idna-2.0.ebuild 579 BLAKE2B 8a9e90a0b4ce75342a1b443bb80c0c7e2036fe88e433fb39fa896c45821c329f842c6b137a04b66688b5f69285a7883ca85218470411af0544a99ada6f49fa4b SHA512 7f624723a6912c61091a9f61ca7315785828617f45951dd151e9c50d780d57671473e86c19325ce793c892ef4b00faa5c7958565ac1813a62c5c1dcd000bba43
 EBUILD idna-2.5.ebuild 604 BLAKE2B 682e9cf0cb1576d33c6575067c79219713c5c86b479eb1cb1716ccfcec6bacc36a00a437a3fbdce9b4360cad6cb03075793777aa1d97f66173ecd21aaf6e3d5c SHA512 d2722bbe1c458e10655a70079ded3d67a2b7b7d18f131e507dab42933abfaeb4c8579a8641971109a1b4bdd2220f5edea5cffa01b545fde68dc61968523fe9c9
 EBUILD idna-2.6.ebuild 648 BLAKE2B bdf47d55344ade2b5b36bee715af2303f5168f44d594ef88e54b6c08b7a4752d9e7093d4627775aedae1eadb0fc0501346659f02f60d83ea67d6011b759b44b5 SHA512 2527b7031bab2025258e1204007e4239785a2ab57a6c4db153f9b6ea7c3605d40b1447776fa57e218b2cdaf19ac58936d236dee43f84e417ce6cad1c6b2f88e0
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild
deleted file mode 100644
index 0237b10e618b..000000000000
--- a/dev-python/idna/idna-2.0.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/imapclient/Manifest b/dev-python/imapclient/Manifest
index c4d75d701b7e..c2c656337ea0 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,6 +1,4 @@
 AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
-DIST IMAPClient-0.12.tar.gz 100698 BLAKE2B d5a9ce4285d468ac827c4f33b140317cbff45e28b503e601e2755463957d3eca0144e54f6f59b9564bd1d530d77f791714bd4a72fc44da7e4aace34970bac5a0 SHA512 bd7d3e3911ff5ef1cc4a66f20e261955851562e76228f941d35f16a4680678be6a3741d520cc3133925a2dba9e8b6b5b988d7a740ff8abb63c14db1cf962acda
 DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
-EBUILD imapclient-0.12.ebuild 1706 BLAKE2B 381a447bae17bd9f48fb205c04b3d1b5f4e2c2137b27652af211287717d7ab43fc13f81132020d24f7c9f73752e334803a58e689cca0c0692a2dee5503bfc183 SHA512 bb77119146d5f36a744dd1c79ac3864f208e03876d8fdf6eb5a100c9f661316b39a378cac220c2249b4f55569679b1fe4ef024b0b04b16bf47bf9cd86154bc90
 EBUILD imapclient-0.13.ebuild 1714 BLAKE2B 0cdf72a709583a9937e81219f76f5a6ba159dfe9b12b33c6d011d5b53407641e212272c9c9fa370feedafb7227ffd6c082ac6ab1b9c85925f6c63fd16f4ad2c2 SHA512 3bfdc98ee2e723cafb291a2e3a2994f12f55cacf5c0b804c3b7633980fea0656c3cc79e29fc81734707e9a1f901b85c48b4a557f5c549407df94199de9bdb1cf
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/imapclient-0.12.ebuild b/dev-python/imapclient/imapclient-0.12.ebuild
deleted file mode 100644
index 8c024c439d83..000000000000
--- a/dev-python/imapclient/imapclient-0.12.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=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="IMAPClient"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="http://imapclient.freshfoo.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	# drop explicit mock version test dep
-	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
-
-	# use system six library. patch proven less preferable to use of sed (< maintenance)
-	# but a copy of the working hunks from prior version works fine for now.
-	rm imapclient/six.py || die
-	epatch "${FILESDIR}"/0.12-tests.patch
-	sed -e 's:from .six:from six:g' \
-		-e 's:from . import six:import six:g' \
-		-i ${PN}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# don't install examples and tests in module dir
-	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
-}
-
-python_install_all() {
-#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r ${PN}/examples
-}
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 052cab0becc3..753d1b3bc7d1 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,9 +1,5 @@
 DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991
-DIST ioflo-1.6.7.tar.gz 823994 BLAKE2B 2af10922799a834dfe2fbf7e68a3babdf0934afafd5c3dab5d4b3e60b4ee21db9f933516cd48965c336d36f0f8404b2da5dabdd49070998d8b14e52422ec3483 SHA512 256ded683e65896160546145ac9993f3221170584a70ef21fab3230b7d2300d9562a1bc7d1f8911e5e930340b119fa88cc5d2f9717899bde0ee69501a3ba6a57
-DIST ioflo-1.7.0.tar.gz 827128 BLAKE2B 52f3d0faa47d71ca442f55121f5cff97b70deb2e258d6af9dc61a2bae57d32ab765ad21ac5d97a11cae141e43065d87f7d7f6eb3cac5678dea3eae6248d0d956 SHA512 b7f3ba0511ed5f2cf8031aa11a660ccee8eef0674c8df17ec09ff32268b5c9d34dd2d79956ddf24ab2fcbf4fe8fc7bb5e521f9636f013b7ed6365960b4cabe48
 DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f
 EBUILD ioflo-1.5.0.ebuild 487 BLAKE2B 809b8f7fc482a9ced7f0148e79fc8dcfd58f41d747fafa12248ba82febc237a2a1d8aa77468fc279d4e55d98b4694d5d47b7e9a6957635fb2fe19aaa1bf06cee SHA512 44c4dd772945ac479e121b205989b988fd81ba2d3548636770e47a17a279490b042112c9790cdc7820a1b96ea95e695d1bd114e7451b6b0966bff2bb1889146d
-EBUILD ioflo-1.6.7.ebuild 540 BLAKE2B 39d6075c283baac615918de5ce84a398603f990dfcf1d6f8cb09cdd107054153af890ff67ecf11819df6e08587cb677842fe4e3aa8f7511d50b70fd5c745deab SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d
-EBUILD ioflo-1.7.0.ebuild 540 BLAKE2B 39d6075c283baac615918de5ce84a398603f990dfcf1d6f8cb09cdd107054153af890ff67ecf11819df6e08587cb677842fe4e3aa8f7511d50b70fd5c745deab SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d
 EBUILD ioflo-1.7.4.ebuild 540 BLAKE2B 39d6075c283baac615918de5ce84a398603f990dfcf1d6f8cb09cdd107054153af890ff67ecf11819df6e08587cb677842fe4e3aa8f7511d50b70fd5c745deab SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.6.7.ebuild b/dev-python/ioflo/ioflo-1.6.7.ebuild
deleted file mode 100644
index 6bc509dcef22..000000000000
--- a/dev-python/ioflo/ioflo-1.6.7.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,3_5,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/ioflo-1.7.0.ebuild b/dev-python/ioflo/ioflo-1.7.0.ebuild
deleted file mode 100644
index 6bc509dcef22..000000000000
--- a/dev-python/ioflo/ioflo-1.7.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=(python{2_7,3_4,3_5,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index fe5301ef0a50..4633c92e2166 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,7 +1,3 @@
-DIST ipdb-0.10.1.tar.gz 8595 BLAKE2B ec45fb7233506fb100f5c6ca7b4587dfa552afe2ed92825ade90860ff4a6f785a1bfdb6bcc4d81e08a69f80160ddc301d7c7366b376aad49bb34fa89c2eb676d SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2
-DIST ipdb-0.10.2.tar.gz 8827 BLAKE2B dded5f0b7fa7fefb5f9089626d5be27cca405a796e684fbabb85527854c302739004713b09d0281efd8855585699c02175eda47ec877a1bf749bbea12d884742 SHA512 5bae921cf7eb8beefd26a0b3ed0969b3435d86bbff7289dd874d0a011c63c36c50683a2a15191c3d6f5ddc1d41d4ae812bbdd831c972cfbbc54258085765acbd
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
-EBUILD ipdb-0.10.1.ebuild 651 BLAKE2B d953767f3c0bd5985915a17c916e0ac12a7a8ca34c9bf3c2214871cdbe00eae511e38915a3cdbe6e35d1a0b2549a07b34729898bf56da20f922797c0f40fcf45 SHA512 a32c3f0f1f5c332da3526f28c6a09798d30b04628ec937e914a48a5d695212c9d9a77d185db4dde7d3247af7ffe1029264f819e07774e3773f7543c04ba77bb4
-EBUILD ipdb-0.10.2.ebuild 673 BLAKE2B e636b867ea4999da2c73c70b99cc702fcbad76660cd30ac33fbdb3f8e843bf0f670aec755a638291422eaea9dbd6b891326223e3df91b2cae6ac90deb11f2ab0 SHA512 b75d622cb243649d7657aa0beb918e73045d5f223b744c2faa79f37706db67b62e4822257efaf6181f57e41ff09a8657382d09c2c70fe9b7a31734ee9539de90
 EBUILD ipdb-0.10.3.ebuild 671 BLAKE2B 9d730b010e323c9330135545d6f13f4aca98cf776723ca8e254e019568a124034c3b27ac841b7c6707baa109f138181ca4b6515969a631de011880678ae994dc SHA512 208f24cc1b784071a9d1a0ee5e48e6ae1bb03f231e7d27271f0c8dc255b280834cbd9ad8c45996a85a0013d017383423b865527fdcf218db3dec972418186dbb
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.10.1.ebuild b/dev-python/ipdb/ipdb-0.10.1.ebuild
deleted file mode 100644
index be794f5033ce..000000000000
--- a/dev-python/ipdb/ipdb-0.10.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=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="IPython-enabled pdb"
-HOMEPAGE="https://pypi.python.org/pypi/ipdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
-	"
-
-DOCS=( HISTORY.txt )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ipdb/ipdb-0.10.2.ebuild b/dev-python/ipdb/ipdb-0.10.2.ebuild
deleted file mode 100644
index dfa3021163fc..000000000000
--- a/dev-python/ipdb/ipdb-0.10.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=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="IPython-enabled pdb"
-HOMEPAGE="https://pypi.python.org/pypi/ipdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
-	"
-
-DOCS=( HISTORY.txt )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index d504e08643e8..e31b55abb30a 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -4,11 +4,9 @@ AUX ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch 1311 BLAKE2B
 AUX ipython-3.2.1-set-mime-type-on-files.patch 1175 BLAKE2B 892d05a922d594400501583bb9b19f36b539220c851a5958d928d8efe631b696046fba3a7a3b14bb688de44f82d3e331ed5cf791bbc0f232c30ce8c6ae1872a9 SHA512 d4791082b2b784bfe4998ad135ccfe0aa7e39f66e26125b75b15ab0b2474ba079c718e913853c709b2cb4e1def620d185918a063f3afc21dca474497f5982b4d
 AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 BLAKE2B 30ada82abf662ed84ff64be786b1cd9292c0b1507aa8e3ea2accd509fbd5dd7808074cee10a5b05bda62e04c1a6f97abfab12fa0ece9ce6d25e9e5032e5ebdb9 SHA512 6b6efe04677cbf09fd9b42e2bc981779371a5cbec2ddaeee911b5246756300b75b54f540f246c98c84868c5abae4ca2d60787a168d2bd95dc2db35e16d5d98f4
 DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617fc2ef735f5705edafd2e9bc65169302ea8f775843c7da5029bce0dccb541233a7c82faf58a676ac5079f9664734 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe
-DIST ipython-5.3.0.tar.gz 4967956 BLAKE2B e4e3722b831f8908276ea55452f53daca4e5acda9c5f49d73517cf9d8f9def83722071c0d521c87b51e9347dae28feef38656abd716843b75e29aa6a5e4850b1 SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
 EBUILD ipython-3.2.1-r1.ebuild 5044 BLAKE2B 26d3414f0390f53df72271d6faeefc95bf6a7e76cc67f535bb4374abd572300247ae5c436f82d34cab1ae2502b0984cc28c6c4e8e4e2c60a0346358934a6ba22 SHA512 2d786c8dcc972b6231884a0a874e371642bc8c01ee588988d26989b251277b344b1373525ce6be713931c69c56ec83bd70e5aa29379113e593cb75eae470f69c
-EBUILD ipython-5.3.0.ebuild 4324 BLAKE2B f9168b70f6f28d4b9b76aefd8bd3f87ac5057c269d4678da115552c9742da3268e89f1f607efc12ea6b9b75b174dd23cfb0c432b60670e9180e0077f383d3101 SHA512 d2c1b88c148df62fa9444f5300ddc85e74131594c4e16b49a2ea3d938ffca582e5ace8b10adfdfea583e3d6eaa44bd35d2281e23b7946625b13a6e0981c39fec
 EBUILD ipython-5.4.1.ebuild 3645 BLAKE2B 42e25bb5e0277e79af42cea13c17ab0a9e061928b3bf7676f645528ebbc432a5f48bcab0d7f9fdec048c3988c2b18a8773f6532fdefbcdde3094da011f323429 SHA512 db674c38e00c44a040bd90432a869e142fe138d00ec06144522de5f91db3e6c1cbf1e73fec262b59b2968be527e2600f39d628b844c42457f793a6a8df86c4c1
 EBUILD ipython-6.1.0.ebuild 3387 BLAKE2B 546e96ad93f0e43c8f433f4cd6f8c17a0336edd8194d355a41e7333774f32dc881b0eaa24a648bc5249a7ca72ef7a2612bf7a433b0538941801bfc0eb5b77758 SHA512 b8a6305d6f8de92ddafedbdfa695b51275349c2a1e1da03f674d94e67a5e62d48d0c38c84c9ecebd5fc5d11ce394fdb384d7a6807cf413855dec0516e5dbcd9c
 MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild
deleted file mode 100644
index d20428e2e2c8..000000000000
--- a/dev-python/ipython/ipython-5.3.0.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
-
-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 qt5 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt5 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/jedi-0.10.0[${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}]
-	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*')
-	$(python_gen_cond_dep \
-		'dev-python/typing[${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}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
-		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="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	qt5? ( 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() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-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() {
-	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/jingo/Manifest b/dev-python/jingo/Manifest
index 307417e0366b..11ea69da8012 100644
--- a/dev-python/jingo/Manifest
+++ b/dev-python/jingo/Manifest
@@ -1,5 +1,3 @@
-DIST jingo-0.7.tar.gz 9365 BLAKE2B c384719f789598a38c5acd662be581344ed96d1030920dcbde78c8a57523f336b0ad060f798bc628ed2d22d8001b7b0e75621149a73d743583e69531dcd08df3 SHA512 7358c20371d761ad147aaa2991056d1789d6a80d645741d816c38369abc469911ca6a1ab4324e7b1243832605fd80cdb3df89610106d2a850f634f1595da254d
 DIST jingo-0.9.0.tar.gz 10536 BLAKE2B b7cf8cf544c44dc74d750f85e5abf43a0d58bbb13a814610b7dd970995ec8e2c4b94d6b46f20be7031a1755fa47e9c28aa98f17d08bacdb967373924302c7739 SHA512 ec064df61639a96dcd0f0b8383d93a650928035e8744f600bd55e42e2ca4b2436db9cff3d75780d2803e9a326fa17308c424c693e14553c9b9a3b45e4132989a
-EBUILD jingo-0.7.ebuild 486 BLAKE2B e972ac9acd18af7d2b6b098652744123dd2b84be1c1570869699975ee94b4b86262e5aac7d8ff508c97692c4800e93a97b9d06b151513848c4299587afd8321c SHA512 4bd35905302c8df60a1250c71e9d486de6bf2bc3a769fdfd50de709bd485549622f821a882248fdf0fd4d1316fe58cad5225185f1470f2b4dd491bfc59be0809
 EBUILD jingo-0.9.0.ebuild 494 BLAKE2B d15ad2d4f093c052aaa46961f3627cf0267ab3181a12ef6a78316be26f87674a34d1e86d3d6ae2ddd0b3fb5ff58ea63b7ed2415dc489a4e8b023c3c60e751bf3 SHA512 7c9e70ab9c83ac5d14658e2380e337f8c6341a5fd25e9406cb3bbb90bd46b557f7e5ed820087e91d559c603d1edf8474d6d22cc1ac2d62c2982de9ec048afdf7
 MISC metadata.xml 373 BLAKE2B 0ae09f7892cf74eeda3b0043f8e9dccf91c3a0f26d7688d4557d433fa30476970e9b556dce038c368d271268ead212cb84baed641dfd297f5f0086dc8a8e25d7 SHA512 a04d5e28ad423aa29d52e8bf57b5116523c596acc6fa1f7cbea6929736d4e969ed859b87e742e1a9ce3f2c37f15802680be129aa37595d43918a4edb3351e9c0
diff --git a/dev-python/jingo/jingo-0.7.ebuild b/dev-python/jingo/jingo-0.7.ebuild
deleted file mode 100644
index 52c0324c275a..000000000000
--- a/dev-python/jingo/jingo-0.7.ebuild
+++ /dev/null
@@ -1,19 +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="An adapter for using Jinja2 templates with Django"
-HOMEPAGE="https://github.com/jbalogh/jingo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 6321640cb8a5..3e4e81ac44b9 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,9 +1,5 @@
-DIST Jinja2-2.8.tar.gz 357055 BLAKE2B dff1f706ccae2e63a973195d77ded0c59bd8042ba5e8e269031ed97c090eea1a69572a866f6fb9c8afbd7a0e2ab3e414786c6b7d0153da558bbad38e2847d5ce SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-DIST jinja-2.9.6.tar.gz 487185 BLAKE2B 32f11030cec4fc085c6b866e0409a7b04f008720fc13e619f168e5fb5b4eee340beea7761c42940fcbe24a032548866ddf7938d7c06a6e38e6e898bc334af94c SHA512 934e253d9d621fd6d19302ea5e73b571a806c0e31e10ac29b54700ad6649fabf321b00cdc513bb3fb551ee28e83de7f163ce9ef88d232a6c178f4ee5dc2e69b5
 EBUILD jinja-2.10.ebuild 1661 BLAKE2B 1990163cdaa3caab4e5c823de8a06eed73c94b608be15bccb87e919c9697e06b539c73202e7b797ad611db46a5ed376fd14d9e69e47214d3e8e6989e68b0e91c SHA512 7c102db950d863abd1cd63ac166338dd72dc043cceb8ea02b5a96ddfdbd8ec63d6f0f3ea68f8e7937790a4389518c72db9f84706aa7e1895438ae7e51eaa2859
-EBUILD jinja-2.8.ebuild 1689 BLAKE2B ea4a8a52dd21ad999113640ee3dcfa7951e209a3405a6947d0080aa5022af665724076d1b563a02a45a70af2a77e54edacf60acbfd10a6104e5d3edbadcdf4dc SHA512 59bc262e5d2f3880f914753d583b90a39f512f25426f0d5a7de7400f0aa196c7dd087de0e17b7ea44f1a89ab95b549cb1479a56516412bee8b6418facacabff5
 EBUILD jinja-2.9.5.ebuild 1744 BLAKE2B 7d98a97560b49d203f68ba10483b44d28a8c689acf51cdb917ad191f9f9bfe2523ebbe4f976b1ebd2f2a30a1a4651dd520a82a619508e13997c2448f10efc6ce SHA512 81c239488b75f715c995d319299d9d36b84cf2158fdc4fb281a7c6cfcf5ffc452ab16d3da842b2d4aad6860dc78daf803dabf9cafde96603eee0463bc12e04dd
-EBUILD jinja-2.9.6.ebuild 1661 BLAKE2B 1990163cdaa3caab4e5c823de8a06eed73c94b608be15bccb87e919c9697e06b539c73202e7b797ad611db46a5ed376fd14d9e69e47214d3e8e6989e68b0e91c SHA512 7c102db950d863abd1cd63ac166338dd72dc043cceb8ea02b5a96ddfdbd8ec63d6f0f3ea68f8e7937790a4389518c72db9f84706aa7e1895438ae7e51eaa2859
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild
deleted file mode 100644
index 2c30af4afbf0..000000000000
--- a/dev-python/jinja/jinja-2.8.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 small but fast and easy to use stand-alone template engine written in pure 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/jinja/jinja-2.9.6.ebuild b/dev-python/jinja/jinja-2.9.6.ebuild
deleted file mode 100644
index 35747dfc21a7..000000000000
--- a/dev-python/jinja/jinja-2.9.6.ebuild
+++ /dev/null
@@ -1,72 +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 eutils distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
-
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${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 ~x64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	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/jmespath/Manifest b/dev-python/jmespath/Manifest
index b1566a635f6f..a963e6154b95 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,7 +1,3 @@
-DIST jmespath-0.9.0.tar.gz 20855 BLAKE2B ad3707f70c37a2ecdaa60448e1e0a092da21a3a72aecb7f66fb0e57f942618d45c6dd133b11eead48d74e9057ed14e85d72ba87707ab3838957db964b860aca4 SHA512 c3a707bde5e529554638255a6a6dcf49591ec7573e28d84d34b3c1b8f84d13289ab054818f88b72ac8aee0f1af6ae830cb661f027e90efe9fb9edb4dcf5128c9
-DIST jmespath-0.9.2.tar.gz 22773 BLAKE2B 69cc25f8efa48d1ec53d1704bb2933f53b72d50f286e89e1c5d64c790f2013f5d8d419d97392fec8b9a76935475d08582c6266acd2d9779f388debbba2cd5fec SHA512 8363c234955d35d292ef27630a98d13c68e9f22d19892c44c68796eaa9c12d0a11921cfdbf9b517b2956b82943ae0b9dafc9a4b756bf0f15c4c6b1e3fe4efe1f
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
-EBUILD jmespath-0.9.0.ebuild 556 BLAKE2B 3c6171c3b15b6ff75f3e74058298434b894df1f238b2243adfb4dd99d9f80cd3383cc8d73df4de5fb54d8aac9e3cda68ea171c1ce99ff741329db9f1cda47553 SHA512 fa3369652afafdea2501450b4032ac95f38ab2e4d56359f0904de4df33b5a97985927f60326ebf6cd6f69e966315640adc40197447c7341f7193697680e9f82b
-EBUILD jmespath-0.9.2.ebuild 570 BLAKE2B 6a6b7d9a86dd6d853f0707e6cd47a6a8582de14deeed481d22477adec4c8cafd75a1b0a130954b2a8b566882ea445e748f12f6840df70be05fd10cf111fa259a SHA512 f457cf10472a893eef317db97debe84c5ae1f398546145cf596fb230da44cdbf90141ee85f70951b0b69ee2528222fdfa69da2122a2df98b4ae5f6b683e6b1f3
 EBUILD jmespath-0.9.3.ebuild 599 BLAKE2B 0827cfb32a16a8cd55db4c8f46cfb32c0ea5e4b1bebb4d46ab6cfff534922d5b63386957954da5040a1cc304c34c29e94a919b0e86f6a3d6d72dd94622d8b98b SHA512 009d2e62d4523d0789c2412493b427307838cd6be31c8978a7f02522d68831330df8e2ede9a9ba710ea9890ad34f69288a5683648bef26c5f1d74b9f1ced434d
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.0.ebuild b/dev-python/jmespath/jmespath-0.9.0.ebuild
deleted file mode 100644
index 574ec8202263..000000000000
--- a/dev-python/jmespath/jmespath-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +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
-
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/jmespath/jmespath-0.9.2.ebuild b/dev-python/jmespath/jmespath-0.9.2.ebuild
deleted file mode 100644
index 2280da921034..000000000000
--- a/dev-python/jmespath/jmespath-0.9.2.ebuild
+++ /dev/null
@@ -1,26 +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,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index ff348a7d0da2..25519e01f650 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,7 +1,5 @@
-DIST jsonrpclib-0.1.7.tar.gz 16980 BLAKE2B 76052a094d45cd483df8b4e12e657d43aca222f2baf6f89c733c0eac0c9b52db13b23be89d5e729153ed21988b04c4545f3e5dfd0f8bf1dbe4dd03b439cb0f1e SHA512 caa315879faac986c14a15cd87591ea2823405f2ea0731962c37147378f77bcfd260c6e7900bc128392332b27e2c0ae23cab9cb6150adb39924f9a369405b2ec
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71
-EBUILD jsonrpclib-0.1.7.ebuild 633 BLAKE2B 5964bd430a3d3278a602d079afeaa15762372d7ce35b0e84884efd525d8b533e4be79fc71358b2c39564a68b7233a4aee4bfe65a77da63bf0397dbaa15ad76bb SHA512 debe25d5265d5f2d50f7d17af46beeb6da9879bf54734eaa36481c3e0030d60bec3f9525674a4acf6360c8135204096f1743593149b9e32522a299d7238bc221
 EBUILD jsonrpclib-0.3.1.ebuild 708 BLAKE2B 708cbebddd314140bf094c3bb00780b33a7d68c31fe077f60c812f64f27d6724cabea52e8456bfb24fde044e49d2209bc237d7110baf96b940cc4007372b3be8 SHA512 d9d61aa7a6d9b35a3ea7c1a6a9fef2bc3d5e9f4999ef11f9daceb28e5d3accccda06b81f776b8791422844aab6e35efa6a37a69c160439510c3a529f301e407e
 EBUILD jsonrpclib-0_pre20110820-r1.ebuild 573 BLAKE2B d78437cbefdcc6f269bcc1139deeb82a7ad2c96bd4313851d57aca21635a7fd784545f9487ccfa1eacf74f093e80d76294b697a85004e7e6f0ce094b045d6995 SHA512 10a9c32643d393ff9f857eb2d48d708d1635cc52d3369bac0abe05d0cb29b67295d49126380f5c880dd61d83e0676a1934a9610e95c8a0217e1e920964b1b800
 EBUILD jsonrpclib-9999.ebuild 710 BLAKE2B 563d5e0e4946e3912d6b87d60016bedecf8413d6947e48b1b0e77a2ae7519cfdbaf6ef4f09f2a4635e890db2016e9866f0c3a9dc56491aa6b0d60c2de912a2a3 SHA512 a1ddbb9900c1aa49fdb6c758b134c5ae00e9f17ca0ae17faf36a5024ce194ab00b80b583d65a4bce281defde4148ea0816b4e01c2a516ba707569fe22c9b073b
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild
deleted file mode 100644
index 0f9b2831c048..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/joshmarshall/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
index 7c796b3478f8..3a20c6d4b9de 100644
--- a/dev-python/keyrings_alt/Manifest
+++ b/dev-python/keyrings_alt/Manifest
@@ -1,5 +1,3 @@
-DIST keyrings.alt-2.2.tar.gz 26121 BLAKE2B 7b8967d15341e3fd0cc4a7b288688bcd3fb87d4f1a8ea34b70d23d0521794a2e5aa74829bf998d92ae4af3137e8f4e4654c8edc39b77612e61e9945538ee0428 SHA512 28d29c1f3f0a9612baa61d4506f0ac0782105a0c04ca2d9be63bd3106c82c2478487a42f2d5396d2f5e5d7205ae4f2d43221dba6ce6587e6e807d597984c833b
 DIST keyrings.alt-2.3.tar.gz 26170 BLAKE2B 5459bfbde787b82021c04394ec475a406805a97cf3ac5691aaa654790800b155291500946f29eb12cd0ae33061c0b38ca65c5733ca144e75e9047381d86ee2d9 SHA512 593194f0b3e64ebab9950b1ee674e43afecf6410110e7c683cdccaa121eaaff864ef07763363c0b0ac25b94e913d6ba2e1bb1ebb428ba14e81e3c29335b81807
-EBUILD keyrings_alt-2.2.ebuild 1239 BLAKE2B 3a319784a171b08bd7d9d1993406bd7b41fcdb61c1ff1c9628aca3bbdffcf675480f3242538023fc1260e434686be3e1e94581b133cb005804fe161343a4564d SHA512 c5a6a052fdf81e92cc2921184a7eec7e5f92f62fa08b4dfe2e41bb2360ed6c566e694b4941bd2f3069783d9b73a24a94a92db4e5c90232a224d7843974773ce0
 EBUILD keyrings_alt-2.3.ebuild 1240 BLAKE2B 92bec4849fbb223e3dd8f634c05e0e52299ca946e2f64947a030f314bb99324a6b8e2c442b3143691c47a049c67fc971500ba52644e1b6d277c8bc8a5b3bda33 SHA512 e1be55dc138605f1c6ce927f41830d2f42e6d397daeea9cf9d834b2b2808bc4a7ae6908f4d47ec2442ab4deb575453bfa85d237a8c90d130ec40085014136ace
 MISC metadata.xml 565 BLAKE2B 577c4bb77415ea0862b4a916665742d20d0c9b7289ab9828f37b1ac22ad97bb6859b2745475b10acaf52fffd1d9df3d9bcdd53ffb4213746e62a528525d65938 SHA512 e1513ec8f623dcdeb869e49e3bb1325bf8192075a0478d89101f9430645537768fc25d2adf579783b03f8c7848a4a7a67dd4bf006f662f31b92c934b24cfb531
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild
deleted file mode 100644
index d7f475cf58a7..000000000000
--- a/dev-python/keyrings_alt/keyrings_alt-2.2.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=( python{2_7,3_{4,5,6}} pypy )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring implementations"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt http://pypi.python.org/pypi/keyrings.alt"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
-		<dev-python/fs-2[${PYTHON_USEDEP}]
-		dev-python/gdata[$(python_gen_usedep 'python2*')]
-		dev-python/keyczar[$(python_gen_usedep 'python2*')]
-		dev-python/pycrypto[$(python_gen_usedep 'python*')]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Multiple failures
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests']):g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 552c1d01c0b2..7d4fb1f9e5c5 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,9 +1,6 @@
-AUX kombu-4.0.2-dict-iter.patch 1022 BLAKE2B d9c52fe4ad213ad65a645b3b104fea2b05a22d0aff44d78d602cc0f4a333ed346d9a327672b7255f7b5f7cfa374ae9088417a56c79b68e7eb1334db85b3620c3 SHA512 fbb52e5fa20b4d295cd7414ef1e8b49fee6cd31e465b4059f01ccd65d96c966af0e62388fa2f486a152fe7174deb75a889c86a7cb1eb4c02a886e2c57fe0bb27
 AUX kombu-NA-tests-fix.patch 495 BLAKE2B 08c35788e488b2ae94f643850b649df379bff7c87b53f80039734245303b1d6396559c70786d5938e31a9ddcdc2856f9a13b9939086ac91a08ab9194da3623fc SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264
 DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
-DIST kombu-4.0.2.tar.gz 418051 BLAKE2B 28328692519188fa67eda545ee06f56edc681ea5bebbed73cfabf812e0b544dd8f8cb8416cc930587e3f7658bb4b2701bfb0c8eb2005b3a3a9b506e9252a424c SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
 EBUILD kombu-3.0.37.ebuild 3727 BLAKE2B 5a74030b0df42b993eb11940eaeadca125802f2aa15b3958228fa40ba73080ab370ee4e0c2ca58da1ad51e311edf588e6fcf68fbee1050aa528e00294c148b57 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a
-EBUILD kombu-4.0.2.ebuild 2141 BLAKE2B f1ecefe48e944395400d1aa59dc60f13b5ccdddd7aa220311eab1f0023a0d523102cb8700fca93702175e09155fcf888e394033db8fc308330183407ce38e913 SHA512 816f2b3f8e1381c482c6945612ad8f41d92fa3b85dd0cf45461a7494833a603cdbf0f99cdacae65fbc61e7ea03133a5546358b34db7f10de93aff68a2af17d78
 EBUILD kombu-4.1.0.ebuild 2148 BLAKE2B 36c0c8ae345ccfff8db38b2f4d4be1c0f5d64a012263ce87f45c6ddd2818d9ab1fc075f2a491cb878093976b1a33b7f89ce8da9fb5eaecba7090149655d08749 SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3
 MISC metadata.xml 576 BLAKE2B 05dc771ac713703f5d403483255e64d7f8df363b81856af7019c954a819d4b4fb051c5250a588d714d755e9785cfd0bd55502c9355aecb99171539b672072087 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b
diff --git a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
deleted file mode 100644
index fa3e545c6273..000000000000
--- a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Tue, 21 Feb 2017 11:52:18 -0600
-Subject: [PATCH] Don't modify dict size while iterating over it (#676)
-
-This fixes https://github.com/celery/kombu/issues/675.
----
- kombu/messaging.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kombu/messaging.py b/kombu/messaging.py
-index 03e7e15..e1800b5 100644
---- a/kombu/messaging.py
-+++ b/kombu/messaging.py
-@@ -397,7 +397,8 @@ def revive(self, channel):
-         """Revive consumer after connection loss."""
-         self._active_tags.clear()
-         channel = self.channel = maybe_channel(channel)
--        for qname, queue in items(self._queues):
-+        # modify dict size while iterating over it is not allowed
-+        for qname, queue in list(items(self._queues)):
-             # name may have changed after declare
-             self._queues.pop(qname, None)
-             queue = self._queues[queue.name] = queue(self.channel)
diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild
deleted file mode 100644
index b5d030da5273..000000000000
--- a/dev-python/kombu/kombu-4.0.2.ebuild
+++ /dev/null
@@ -1,76 +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="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples msgpack sqs test"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1)
-RDEPEND="
-	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/couchdb-python[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dict-iter.patch
-	)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html || die "kombu docs failed installation"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index f63baf0eca34..bb95b386431a 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,5 +1,3 @@
-DIST ldap3-1.4.0.tar.gz 300079 BLAKE2B 7e979cd106e0c7caf71fb8763dd962b2131501d54b6cfc1cae6e3a6825e0fc7f826af0f87deafd530b1a642a937b77b3fdc413666d1247b4a60b0deae8872e3b SHA512 0aaa05355dd065f66a6fb24ce298f8b632f013ffa47e805b0a1674ba96e89554106a437d8a6fceece36ccb84484e447595f459697baba9a432c458c9969f0da6
 DIST ldap3-2.2.3.tar.gz 331483 BLAKE2B a6479e6a02d0a0682b809cea2b63ff9ff3935f2d083b9dff3a02468d3a27cbc75dc69dff64f523c0b077f288b3e1e565433af13a607568617c309c3e894d7a62 SHA512 a954f6c582e88addf0bd6dc6fb24108d76d134b80c14a3dca0f9f667dbbfee484cb7b0444822f7e82a41af7dacf61ba111b6dcbf215b7f6df26a3784cfd2fc83
-EBUILD ldap3-1.4.0.ebuild 690 BLAKE2B 7943a26bb6073444224e67e3d3c90bba5d89e9082434269cd22c7990bb0a43a3c28e7579f63dd30c9ad8efbc425c674f76f7d28640f303817bc481f762f17180 SHA512 87dc87d78f4c94a555d1327e2b29c1a5e0f6148762b7d50950daf50d037e04b7b033f207008e2dddfc448b51e3c907cc7c474f42ffaf757fa9a88bb98e6a337c
 EBUILD ldap3-2.2.3.ebuild 875 BLAKE2B f0779a4db90199be1f0d24e503f74eab0a5f63f950ead034519260f5ecf15f6632779818d482fcfef811cf715e22656366624a5105ad3a74754a8c8595c15e6d SHA512 a8bb1875b9590816a38a5ee933b8b2be7467b0811d3b15968bb4a1139cd541faf86cfdc80f61fdcc4dc0e2408ff46722dc0a8679221ada0144217562a11947bc
 MISC metadata.xml 667 BLAKE2B 3dd9eac5fd53006653b3e1416ea1b7b4445daee2d041dce6672043effb4a4dc919503ab06b18b6e077981749f25b787657a3f8ab7d68572eefcda78af4c15faa SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747
diff --git a/dev-python/ldap3/ldap3-1.4.0.ebuild b/dev-python/ldap3/ldap3-1.4.0.ebuild
deleted file mode 100644
index 8601757c6141..000000000000
--- a/dev-python/ldap3/ldap3-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +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="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v -s test || die
-}
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 696d8685b09a..7b2ed882714a 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,13 +1,5 @@
 DIST libnacl-1.4.4.tar.gz 30965 BLAKE2B 9f3b4f10020349bbdd038c7d07d8c6cf3ab31edd26e38344c9cefc1dd8e71f5360e07e9d2673b915733b6c4a1a9c6e307a39f86b1b74e76d5800cb35d8161a95 SHA512 dbcf16b308bad85195a96d538a116a915876a049efcd2e4a333d16a57cc59dc28fe85b2cc2c6ab036360bfd0b93ce4d1a1c0323046281dc35d290e9f12253470
-DIST libnacl-1.5.0.tar.gz 47386 BLAKE2B 97d2c484473af0305a40e8687c0366241cb9c151643f2a69a2132506409140acd0003c0d1d9c43a552e0588e688acce6a85167a9e36dce0be4cca632e9a3309d SHA512 72c6041e14bf705d6d3b0fd0b77b1b1c7f4a86653113f56fed6b4e20369ff8b79ee1ea23179661299c51f13602dbc3f33e98bab0f6b8080d40ad75253137391f
-DIST libnacl-1.5.1.tar.gz 49383 BLAKE2B c472ab57979222dab19f82215fae31d16d65e5dd8268b2a9a09c02ba2221c0a39d65ac2a670d7ef7347fab2591349ead9995398a47f57741359ca3b3796f69de SHA512 8bc5e0e15b35814249b69b6c1270fdf2c45af808c3315a6499b25a4861f0b21fe1840630a08cf808c8dc840f417736dee9d020d21d5d1d697b8644bc2645b12e
-DIST libnacl-1.5.2.tar.gz 49573 BLAKE2B 6ae55b2137cb9345710e51ca2e9cc3cd3422008d48bdec461ee6a0b8bcec6dced23f4a8c15c032a4e7bd58ead9bcdcdfa15188daa8f6ba644b813c4943828f92 SHA512 f5d0827b621c0ddcb61041c3bb665d2c70f5fa400691128134d519fe454439648e7b2e36ab73b0cc827032461ad611e0834655c2f75e3cb3b53063c33aba8c1d
-DIST libnacl-1.6.0.tar.gz 39711 BLAKE2B 513112d3892f52e2ab21434a2192ec38541f2e265e249b46c5187ba39698ca3daa7c9c6c8ada8bf4e702789bddbeda9c4662990cac8f6a187523f65cdb51c88b SHA512 6f5202ca50bf30526bc51e2c528fe86aa412eff4b912d0b09da7f019de2929d2be2a9a8f80340849cf77b3593eae4fa96f2c0920b5201c5786f5009ad5f32c34
 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac
 EBUILD libnacl-1.4.4.ebuild 514 BLAKE2B 6cfb79e6083f043885440f7c28243727aba554310ab8b0c1a8cea46bee2b397104d800d171efd6cf2177e534626b651777c8aab9559a8f87d2313fda2018d7da SHA512 2d1cde34848085f3388246464ef19deb02a92e2de16413fb539e086a6c61f28b553f3b1ccfb1410455618151f48c69bb5062e5adc5ff76efcf39eeb55fbdc318
-EBUILD libnacl-1.5.0.ebuild 520 BLAKE2B a291793af5a679382859761160ae222e091d73e09c8b74d46de4fa358424ee6a08faa211d952bafd4cef5c54f2df806e886f2e9139db28b2a926e5028f94e335 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf
-EBUILD libnacl-1.5.1.ebuild 520 BLAKE2B a291793af5a679382859761160ae222e091d73e09c8b74d46de4fa358424ee6a08faa211d952bafd4cef5c54f2df806e886f2e9139db28b2a926e5028f94e335 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf
-EBUILD libnacl-1.5.2.ebuild 520 BLAKE2B a291793af5a679382859761160ae222e091d73e09c8b74d46de4fa358424ee6a08faa211d952bafd4cef5c54f2df806e886f2e9139db28b2a926e5028f94e335 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf
-EBUILD libnacl-1.6.0.ebuild 552 BLAKE2B 2342f81b3023600aa4da2ad9b30e82db4cde765beb4213c6058d5ef9285abfb25e1bc19b224a2b6d72160009a70ac326fe3e722e949ee72ead1efa5125d1612b SHA512 137a499d467aee62aa53f25b23256360c8d2ba871659f0e5be5ec0ecfa60b5c79e32957d6b47ff5530dde84b4bfdad5f8d2623285b2737897bc937c436b72027
 EBUILD libnacl-1.6.1.ebuild 552 BLAKE2B 2342f81b3023600aa4da2ad9b30e82db4cde765beb4213c6058d5ef9285abfb25e1bc19b224a2b6d72160009a70ac326fe3e722e949ee72ead1efa5125d1612b SHA512 137a499d467aee62aa53f25b23256360c8d2ba871659f0e5be5ec0ecfa60b5c79e32957d6b47ff5530dde84b4bfdad5f8d2623285b2737897bc937c436b72027
 MISC metadata.xml 436 BLAKE2B d4777abed0c62a24f98f7053792402c4aca92cc9e352b7436061bf4669a18a731bb8edb9f79707780e3e2eb7a01daa46ab7d1222729d7708f7558b42cefcef69 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c
diff --git a/dev-python/libnacl/libnacl-1.5.0.ebuild b/dev-python/libnacl/libnacl-1.5.0.ebuild
deleted file mode 100644
index 1b4f8c2b8d03..000000000000
--- a/dev-python/libnacl/libnacl-1.5.0.ebuild
+++ /dev/null
@@ -1,22 +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,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/libsodium"
-
-python_test() {
-	${EPYTHON} tests/runtests.py || die
-}
diff --git a/dev-python/libnacl/libnacl-1.5.1.ebuild b/dev-python/libnacl/libnacl-1.5.1.ebuild
deleted file mode 100644
index 1b4f8c2b8d03..000000000000
--- a/dev-python/libnacl/libnacl-1.5.1.ebuild
+++ /dev/null
@@ -1,22 +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,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/libsodium"
-
-python_test() {
-	${EPYTHON} tests/runtests.py || die
-}
diff --git a/dev-python/libnacl/libnacl-1.5.2.ebuild b/dev-python/libnacl/libnacl-1.5.2.ebuild
deleted file mode 100644
index 1b4f8c2b8d03..000000000000
--- a/dev-python/libnacl/libnacl-1.5.2.ebuild
+++ /dev/null
@@ -1,22 +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,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/libsodium"
-
-python_test() {
-	${EPYTHON} tests/runtests.py || die
-}
diff --git a/dev-python/libnacl/libnacl-1.6.0.ebuild b/dev-python/libnacl/libnacl-1.6.0.ebuild
deleted file mode 100644
index 19dc1f1821e4..000000000000
--- a/dev-python/libnacl/libnacl-1.6.0.ebuild
+++ /dev/null
@@ -1,22 +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,3_6})
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/libsodium"
-
-python_test() {
-	${EPYTHON} tests/runtests.py || die
-}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 4f774eacd2ae..7d83d1e8e7f5 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,8 +1,6 @@
 AUX llfuse-1.3-cflags.patch 752 BLAKE2B aff689d4ddd5b5e5cc977595891c68b4e4b5876d0faf5cd243be942961abec618f861d835fa501585c04902a4be1491854d8a80c32442b4125cfdf8c29984444 SHA512 e0751e90fa89fe7fff6844b5be3cd8b55cbe4c62fb3341643a9049ff54c2e8bccc439ce444822b9d0858c83a3cd12dbede5253f9a9e6544ef26747a19f8f233a
 DIST llfuse-1.2.tar.bz2 327967 BLAKE2B f2c64e46813dfee157d7befe9743809c299e03c77ebf6e9ea0e94578aa69a0884b7438aa24a551a5bd49458ddc6c350167afbc1832e1f73cc49c2f5cb529083c SHA512 0c31ac385a98211f8696857654ea187c5f18b655b65199696923bcc66d079a5e2a6f7260ac4f6da17b25ed57c9cb1314ce62fabb3b538a87e4286bbd0763390b
 DIST llfuse-1.3.2.tar.bz2 348035 BLAKE2B d3a3219c8d7462f448486488971842362b6ade8fcf6804d725db30b0e91d3f240ec9443705cb67caf3e6beae8a174f323465695dddd132210e3606aef6dd861d SHA512 f065818134b12dd128574836bc7d339404d9b7d9236b535da709378e9206b17cb2accd97fc0b658f39a93efe126a7c3064f7901468231f63f8398a3e053498cf
-DIST llfuse-1.3.tar.bz2 335418 BLAKE2B 5f98ff510c9688233dbf5a5b34277fa87eb621b884e2353fa0377a9769fd871bf8fa478759cd6d2f11bfd3dbdb0f225469483567f0ea08fd031179fcef87fc13 SHA512 10d6c6dba20031106334559bd84d9477db70cf5e940f5e379716af1140bacaa4defe533cca51ac718e4d37b44414e34c7dcf48274c6fdd8ecc422f2f438552ee
 EBUILD llfuse-1.2.ebuild 952 BLAKE2B dfa40911294a920973efad5c8b9e64a2d73497eb4d43dffc965e8b33d15186027bc2e00a8ef3002d96baa43bea24945a9c4767d6cb43c2bf6e2d1a3fbbaafe16 SHA512 cfc1dbb3edd2e3f3830055172fcc912e90fa7732e0ed7009cecec3dd9996ce917e39f623bc10a40bb04aaf1f82cbeb63e597604e404b8ba5a54d309cc5e6c29d
 EBUILD llfuse-1.3.2.ebuild 1021 BLAKE2B eeebce87dbed5de6c3c6f5427e7145a0a172d21db7aed11d30237231eb8c8d31f71b30e008c27822bdad08540558ae8b1165bcbe44e6d793ea441f965634bc0a SHA512 345a88c66e73f6d88bef039f439d2a973cee24c84dc3e815026450c8b15e0abc7be07206eb424ea673ccac048a16f418230260f88da6b6fa7559e54704c13a17
-EBUILD llfuse-1.3.ebuild 1016 BLAKE2B 3a55710e5321b4ff0aca72611869565f382ba9d3450cfb9bb961307cd037840437032b9f4a0d750e896649264f9f3d1432b1ae50aca24a083852b4cf7b9961ae SHA512 2e80d8167d2ce5d27f55653956b65e6c6d0fa3edf96f26a292577212f1db962f0820c1c9ccce5e3e66a75d85e1775da16f418b969638247c02e808b5bfce3293
 MISC metadata.xml 309 BLAKE2B 35b86dac2f17820c91bccad58f8c0caa57d8b8ec9b549cca330ec285271cd8cbcae173b7d68fdfc7eb7b99f051eadd37b5ed1053f20e57021e6a51ad460f867a SHA512 31061d2419abdc0ded07625ee0a21bc77162b15db90e2559ab9ce71e8a3aed1c866de5aebd8b1b24f566b79a85a45bec4c941542d268daf9df65bdb711d59342
diff --git a/dev-python/llfuse/llfuse-1.3.ebuild b/dev-python/llfuse/llfuse-1.3.ebuild
deleted file mode 100644
index 761de45bf852..000000000000
--- a/dev-python/llfuse/llfuse-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=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.python.org/pypi/llfuse"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=sys-fs/fuse-2.8.0:0
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 2cfca1273c06..752dcecf2bdc 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -2,5 +2,4 @@ DIST lockfile-0.11.0.tar.gz 20909 BLAKE2B 8e13508312efc7eaa463e8fb80bf0a51ae3bc0
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
 EBUILD lockfile-0.11.0-r1.ebuild 1259 BLAKE2B 6c2a3994d7df57daaf1e29f899b0f2f7ebe0c31b2a498a798bcc826b103a8b34d5fe2861c95e4b44a459f874e76c609233d1d2c1bd2d118e4934a5cf0b496a6f SHA512 883c9eb0e3ef7792ba65fbb1e622c9a63ae635dad5e2d23900670978faa61593999a18ab8432411e5edf43149e77b735cd7bb316b61b24082415969065d68445
 EBUILD lockfile-0.12.2-r1.ebuild 1084 BLAKE2B 8fc3412e2035e6d1b3cd9242689b3fb495f858b0136f6ceb5ce976f658af9bc7e85fa7e11b58f346eeec76771413a6a2eb7a796b1bb31f970b3054d297ef362d SHA512 6782556bb25c6608d374830adcb557453c1cb106dd316e4198274e088cdb086322ae9eefc350dcebe015039ca5ea27788bc9378c195c80fcbf9cb4d32d4000ac
-EBUILD lockfile-0.12.2.ebuild 1191 BLAKE2B a05763c3e0321f5d38c6a9d7f0d47c981c63ec5ddd3d7538b4414e8a5b30c7843a2c831c99d07714864ebb07d059690ed69f20f180975f7e7ff6deaa12a27f6a SHA512 2a95be5b416c4abbf1d477eccb6e3f9c88e4bbf28f28ce6f897220c4a628e5fc6fb11921cd893b78830fdbe80cbf8a138159d51f433afe61c9eeb21584f806ab
 MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
diff --git a/dev-python/lockfile/lockfile-0.12.2.ebuild b/dev-python/lockfile/lockfile-0.12.2.ebuild
deleted file mode 100644
index d772d7000ea4..000000000000
--- a/dev-python/lockfile/lockfile-0.12.2.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 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
-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="doc test"
-
-DEPEND="
-	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		emake -C doc/source html || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests --verbose || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 0c96553e2ebf..f5a904fcd81f 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,8 +1,6 @@
 AUX logbook-0.4.2-objectsinv.patch 365 BLAKE2B e5dab7bf2807826b8d8607ee2bf2ed7012a54aebe8d1873870b9765d77d2bea2e6cc342965c9553753c947469745816ca41054864d83ddcef36797543af385f2 SHA512 a66b80355dd76fb965f2f2206b29c327328ddac406db681898ccf56605a3004f7bf84c7b5623fd9ed953b170a87589c47ad1e164c24be8f9d4fd664f482a8633
 DIST logbook-0.9.1.tar.gz 106615 BLAKE2B 4100bda341a1c946bbabfb6ff423b4906f0ada754ebcbaefca93d768bd8c5135a9b1e00207fba4b13ce297cb7eca27364000e9f8b9f52935608af6c9586302aa SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188
-DIST logbook-1.0.0.tar.gz 365307 BLAKE2B c345dfa63f194c8c72f9c29882fbcc241417f7f4b912d95fc540e7e9eb0b3b5101ad3a679cd157ede698496eac3035a96879f87c33d73869863af080b054ba57 SHA512 0ff2348cc04155d13e911bb7f080d2621e2c46e827c1823e6a4f977d39569271001f64c84ca24fcaf269209c15b88fd50c28c2fcf87312761dcf16ab414abc1d
 DIST logbook-1.1.0.tar.gz 367541 BLAKE2B 26e27e94f1238c9188fc66b6eb1f5622d96e1c0db97817dba30c8c70107544ea80ab1f11b71592db6a8e2a9c5d32dd659782a532cb7d263c2f042b41ef88d2ad SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b
 EBUILD logbook-0.9.1.ebuild 1131 BLAKE2B f61a06f70dde90c8fba74fdf6e0c5d08c9065b2fc4477a100407aed923875dfaa7b563f2b755a3a8cdda30091c5cc1deffcb3619b862f6aeaaced8d7e9302d47 SHA512 506bc5ca373aea27fba53b404db372d06ec37d2c77dfed730a690147211b335f6618aa86ce6bd321fc7bdb2486dac81def56eab8b1eed7bde4edf00e30a2ba44
-EBUILD logbook-1.0.0.ebuild 1135 BLAKE2B d4078b10b8622c4309d48cdbb945ad3f70110150e47e875c63f7f97edd42c3b38107f0046fd261e4f6755a06af63ed7c0b521bdb47aa8d620fb033d14750076f SHA512 6ed95cabf1c76ccd997a16a554adc219902cc8379bb2b27cce0c55a02181cf421332e915b2ab3bc703da183b61ea94bf9bb72312fb3ee0afb4e68597d0409375
 EBUILD logbook-1.1.0.ebuild 1135 BLAKE2B d4078b10b8622c4309d48cdbb945ad3f70110150e47e875c63f7f97edd42c3b38107f0046fd261e4f6755a06af63ed7c0b521bdb47aa8d620fb033d14750076f SHA512 6ed95cabf1c76ccd997a16a554adc219902cc8379bb2b27cce0c55a02181cf421332e915b2ab3bc703da183b61ea94bf9bb72312fb3ee0afb4e68597d0409375
 MISC metadata.xml 379 BLAKE2B 63416a01d45934c94f9f56e2872a35d66a625c6d529315697d4038d64fe0947f77065badeba36cd765d2a4781e04ab651b3b812c5563caf3222065210d62f3f1 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82
diff --git a/dev-python/logbook/logbook-1.0.0.ebuild b/dev-python/logbook/logbook-1.0.0.ebuild
deleted file mode 100644
index 119a2db91392..000000000000
--- a/dev-python/logbook/logbook-1.0.0.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,5,6}} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A logging replacement for Python"
-HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
-SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
-
-python_prepare_all() {
-	# Delete test file requiring local connection to redis server
-	rm tests/test_queues.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index 9e53cbfb2b32..ed64f39974b3 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,7 +1,6 @@
 AUX logilab-common-1.2.2-test-namespace-fix.patch 502 BLAKE2B 257f19769d7e2f6df1fa606a1f596d24f24c3f5be319944929d4e258ff8f7068edc977dddf4be2b58df6eedb22e0135d1bfc119340853a1f9352dfe9b8de6aed SHA512 c8a9898a6fa497c21edebe4b6890a87215622dfd1c4ccdd7b23ca7669131200cf82ae82bd17c7226ac79ff3fb4ae964b1bf1470eb79c5aec0018850eacd2760f
 DIST logilab-common-1.2.2.tar.gz 184817 BLAKE2B 0318b4144150303b483fe921e01af326b55b7a3b93a014506685fde0b4e094a88efaaa70f63623264ee34fdfa72703e31cb0c8e9f4a69e309cab50997acae7ac SHA512 9c2161e8644e50cb3d4418430ca95363363e532b286d39cbdb73a51274bee02e5e8d0632b7564049243f497df96102c90ab0aeff9c91e91f7275407a6cfc56e2
 DIST logilab-common-1.4.1.tar.gz 185150 BLAKE2B 4c77b0a136a0de708801971f85b55fdd598767737ed17bc83ad1b934bcea5db67534370c202bc4b874ac774494ec6295a2458a7ae39fae36a9d5b482bce65563 SHA512 e016aa8bd8641b4178aa1d1dd58c8c78bf6c3a80c35c9096d9761eeb49c9ee1ab5952839a1b7ecc404cd60b31078d3e997d73ad4f8d07d88badffe6c8748a059
-EBUILD logilab-common-1.2.2-r1.ebuild 1467 BLAKE2B afb277a99891c129428aeb02441ac162636ee6025255ea395bf3653dcd5cec6f7dadc27cc533665954e614f13071ced4ca2dbcd9edf3920a0eb7f4f07a65ced1 SHA512 eecd67f05f356c81f8df430efca8a4cda2b38e1da3113e2e8ec40631a3e034cef7684f2077777300ccda380874ad58f43289a908dd067265631cb0a2f4a3839c
 EBUILD logilab-common-1.2.2.ebuild 1197 BLAKE2B d43875a405f2af69b70790fc934cccd37a1feb5a068cdec688861ca62c9040655ad88872a2433fd1992752030a922d18a27350ea679fb13e6e543b8c0db3a8e6 SHA512 ea66e669f10d8ee096d5552cb7088b2aff93c7dc5ce14d552f7445308259479025b3b4ef31773744826789ab927d70c37a59014ceb6c076bb8c616a99c573084
 EBUILD logilab-common-1.4.1.ebuild 1419 BLAKE2B e14124033d6f8e340bcd7d676e2a6e11f54ab88ab21ada9e8797b3e76970d544946222356d40ea139f8ae394955c98186ac19c787856c1749fb9329cf15f5548 SHA512 415966255b2fdaf16c1af7f72c8cdb9049f633757d8b72f5c9e30c6a14a37fb6184c4a849807bfbfeaca034d458e0f290aa2666f6f10b493418ae585e1661ef6
 MISC metadata.xml 317 BLAKE2B 88f2ad57938f816c897d8d8c26d26135c064ea7fadd6363cc916f6a047b3a0deb1e3fb9f1282d91198036f457998fca4ab43dafbd2c8c03a72d8ab601542c186 SHA512 4e3f634378fd3dcd721af5e038a2331fab376c3625cb8b9dce6a87921886602ff75d308fc9d7f887a65cda607e9e635fb59e86b1da0c7c11a75860229f90c3c9
diff --git a/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild b/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild
deleted file mode 100644
index e31fdcd05d44..000000000000
--- a/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,53 +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="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" )
-
-python_install() {
-	distutils-r1_python_install
-
-	# this package is commonly used by all logilab.* in ::gentoo,
-	# so let's just keep the namespace here
-	python_moduleinto logilab
-	python_domodule logilab/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/pytest.1
-	find "${D}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	"${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 89779b8e9737..723542209511 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,11 +1,7 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 BLAKE2B 95c7610f2626471ca76946993463eb243501916788f4812f4489ab86f3b49494298bfa780b4d06ff8fc75d46ecf969ae389e4e418631250b5c610225f46a11d9 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229
 DIST lxml-3.8.0.tar.gz 3795205 BLAKE2B 39f3edc7efe48bd569b636de89cfcd8f7e4e88e025fd5c21164e35edf110546112844a4ddb6cb1842649fb165de3b3880b0fdb7a23522a891b35390adf64c95b SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088
-DIST lxml-4.0.0.tar.gz 4217301 BLAKE2B 812c67f0769c9b72e6fcd641ff61821255c7a3036213f4dbc82683e9bd4b94096e44c4af6d9091623e0fa7cccc6286561d3a9947fdeace45100af640e417073d SHA512 8aa85ab6a99097ae2eaa0087b3a663aae8ac81a0a4d685bf857571c811c8ccd6410afc414f14c68702a53e90265726af085d0609ec7f0d3cc96e3702772627e8
-DIST lxml-4.1.0.tar.gz 4247102 BLAKE2B 650e7ca2961e4552f0ca29d81043f44b672c39d07d54d5072b6ac4218c5d43a00ecb79341a2d678ddf35885df224b8afa1ec8bc6b6e4faa46a42e545b1a44cce SHA512 c4a1180a119ec2d21ab29d00cf60e72ca38a2c28eca4f221251d0fd1c481650fe78ec975532c38a6a59c441bb6f6469bbb110b6b0e9d6b6fffd68dbcad90fcb6
 DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 EBUILD lxml-3.8.0.ebuild 2254 BLAKE2B af045d3431f3d876327f59cc9da8523a1936dd81a60806d939776bb01dd00ee0d8c7cb3b219725e4e3e04584dc88ec489d30e09f3623bf7cf2c91a5af351f5bc SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b
-EBUILD lxml-4.0.0.ebuild 2264 BLAKE2B c0d3792cb46ac2f0316d811e56ec76b0d38fe2b363177d8fdb500b07356955412a76068965373b746d1b581bcdc70a433fdde2b12daed752b67d81d9fbb3ee48 SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6
-EBUILD lxml-4.1.0.ebuild 2264 BLAKE2B c0d3792cb46ac2f0316d811e56ec76b0d38fe2b363177d8fdb500b07356955412a76068965373b746d1b581bcdc70a433fdde2b12daed752b67d81d9fbb3ee48 SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6
 EBUILD lxml-4.1.1.ebuild 2264 BLAKE2B c0d3792cb46ac2f0316d811e56ec76b0d38fe2b363177d8fdb500b07356955412a76068965373b746d1b581bcdc70a433fdde2b12daed752b67d81d9fbb3ee48 SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.0.0.ebuild b/dev-python/lxml/lxml-4.0.0.ebuild
deleted file mode 100644
index 2ab0055cd819..000000000000
--- a/dev-python/lxml/lxml-4.0.0.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/ https://github.com/lxml/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 ~x64-cygwin ~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/lxml/lxml-4.1.0.ebuild b/dev-python/lxml/lxml-4.1.0.ebuild
deleted file mode 100644
index 2ab0055cd819..000000000000
--- a/dev-python/lxml/lxml-4.1.0.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/ https://github.com/lxml/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 ~x64-cygwin ~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/lz4/Manifest b/dev-python/lz4/Manifest
index 5e25e974ca73..177918cac32c 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,10 +1,6 @@
 AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a6a14dfa3d2f418820d3917a9107c66f4a8aaaa380cf749a9faf2cafb5265364a1955830d SHA512 7968adb54b414a8dc1ba9b3b8ba4f11695564239786cd37474122ce83f8976920206fec2b846eefcacdd307da6c9f6ac73ead87c78dfefab746540021f44964c
-DIST lz4-0.10.0.tar.gz 91852 BLAKE2B 0817c76e4e7936b61083b5912e1f29380797e0ad985c6df7f7697f757e43d3c7a95852b595f30475c68223e237522c88b097f9a35fc3d0b8984bfe869430cf66 SHA512 5a998eb2a541e7a6b8ff7a2d8c1fc0e6d30cddb35ec2b400f60726a6c9d996e2488c738dd841c16069a13d3eaadad3479ca173cd8c863c7e73cd5a26d77ef658
 DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
-DIST lz4-0.9.0.tar.gz 86939 BLAKE2B f05201273c89bc844199d54f1f05dea87aee211273b16dbaf612abc941b557f83b2cc25b492c502ae65364df59105a439891f75f9786b96665e0453e6efc373e SHA512 744d1759e3aecdd75c1045594f05ca8d7b849c737315d5115d7e84e6a8fbe8463bde301466686245662d71f916aed691a6628b8cf5af9c1c1ad2a0352e11947d
-EBUILD lz4-0.10.0.ebuild 585 BLAKE2B cd789cdd5ac26ee6155a05e190c3f9ed755026541ba48643e633758c29f3ec210aaba6660351d7745d5b7e27681673aa9a78b1e0f09b13cdccd127413ecb225e SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545
 EBUILD lz4-0.10.1.ebuild 585 BLAKE2B cd789cdd5ac26ee6155a05e190c3f9ed755026541ba48643e633758c29f3ec210aaba6660351d7745d5b7e27681673aa9a78b1e0f09b13cdccd127413ecb225e SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545
 EBUILD lz4-0.8.2.ebuild 817 BLAKE2B 42b809ee900c0b91d1bced947bf150bdf9d241187ce2f57fa9f074eed65e1e24df950592f3ef74b6c81baa37cfea080fecfb7022df1e2d66cc2fe96a1ea9e80d SHA512 c9cfce89de216f4ccee6224645f16102b1b782bdc3869270b7b793010453ec676c672e32503e2ea53e41b4cbf9235ee54ae5844e51b2452fc0c61fe364b0d0f4
-EBUILD lz4-0.9.0.ebuild 585 BLAKE2B cd789cdd5ac26ee6155a05e190c3f9ed755026541ba48643e633758c29f3ec210aaba6660351d7745d5b7e27681673aa9a78b1e0f09b13cdccd127413ecb225e SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.10.0.ebuild b/dev-python/lz4/lz4-0.10.0.ebuild
deleted file mode 100644
index 3e2cd6e23b11..000000000000
--- a/dev-python/lz4/lz4-0.10.0.ebuild
+++ /dev/null
@@ -1,24 +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,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/lz4/lz4-0.9.0.ebuild b/dev-python/lz4/lz4-0.9.0.ebuild
deleted file mode 100644
index 3e2cd6e23b11..000000000000
--- a/dev-python/lz4/lz4-0.9.0.ebuild
+++ /dev/null
@@ -1,24 +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,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 71dfb302d6af..d9366c77b7c7 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,11 +1,5 @@
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
-DIST M2Crypto-0.25.1.tar.gz 300904 BLAKE2B 5d68bd9eec03fed4ff7f28f9429e24e8e9cf8d69b165f29d0a7f15242ba545a51e4cd3cf53b7a2e1dd00232dc964debf634152fd0d6ad3d69f012d6c609fd92d SHA512 096d414efd5558f9ca4cebf46a297fa39f799e35c4325e031ee816689345e041370f2129650a10db66ebfcfe64309a7c7b49082306567baaf003b88ed9d60bda
-DIST M2Crypto-0.26.0.tar.gz 305914 BLAKE2B f8231cc7237a4ea826cd07338d2d379aa10f309abc418eed46cfc69ba6796ef830f48956c0ac2a78d0a0266bf8758bc2bf8683b8c1cd7b9f38039e0bfd4fa884 SHA512 f6ba0173833d1b9a318402a3445fbb522f1848c7406face0cc08d384de6b6944395737f5871353ca1488c6655be7ffb0ad7b40b5e98d5954858da4540590d242
-DIST M2Crypto-0.26.4.tar.gz 1116587 BLAKE2B c1f522cb84cbaf5ec8e837b42773b11372f88c31abc7341705da3620377aab2e5ee988cace0fb976f6a61f19b120f450a34021ccd7241fa56ca956ff3fb45aae SHA512 632b71850edd4f4e32d6d3aa83cb0e8068654c087498c88265f999180e0c58917aa6d29c5d1033f597397da98c3dc9acb9d21feddbb2f3da25a368f6a0af60f9
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
 EBUILD m2crypto-0.24.0.ebuild 939 BLAKE2B 88f6d7c8b04529756c31787ee56ddd7e0accfd9fec87ec85e1fe3788870f71a5598f993b16ca3745f6f1b405816ff25ed0e411c4452fc5d0d119c5ef91ac7928 SHA512 b5f7ae379e997a56934130c4b14b9357773904e19ec5357b93de6ab144ec7faeabfb19def44e5c8460d56fbc3b59287121f75b008f83b83e71aaf41e5d26823a
-EBUILD m2crypto-0.25.1-r2.ebuild 884 BLAKE2B d217397d214a0c0e6630ac68a069a282addd856adb6dd0b163bdec40a09a29cc0dd2c4a0688fd0b53de0d1f3f3ffb83c7ff5e886a8a46565c0f37cac18407801 SHA512 e0b18c5f0229beec1c47268dcb03720ccc80b1ea3802aef982c9a1b881e825883213a9cba1f29e1eb6e62e25ce5d5179208889453c1b26047ae4bb33e317559f
-EBUILD m2crypto-0.26.0.ebuild 1009 BLAKE2B c72eb143b0bd5a648ee704fc833c4c2044456cc2508827a505e22c556d15e4b5d38475de42e482be3db8be3d907bc2b92a86a6f86dfc737673b784475f92b982 SHA512 7af6c8703c43d9c8e88e8bd8d87c783dd378d58c6fe897a7a0a4d5db039a8bb78a3753889fb46b6a9637346f510d1beffc59c99cbbbfe507f3fd5ecdb25b5fea
-EBUILD m2crypto-0.26.4.ebuild 1022 BLAKE2B e550caa4408c2ca8c4a1e3cf6447a24e65623f274d47029ca21162347e4db258d6819973d8f03b49f3e4e6e5a9c241c3079e487ea1fe067c7de989317696532a SHA512 7b923e2bb62ca1f0641180d8fd8a15a1524cf5c7019af3e0f4dd9c9cdb41343184d040005b0e98b0db644bb84d08294cc6bb1656d061cb9e35707e6fb2be5268
 EBUILD m2crypto-0.27.0.ebuild 1291 BLAKE2B 03a40567917e0d011ed631e8279dfb86d90ecab4f01b0f0c9759abe387486c9452aebe98a4f4f4304f604da251c4db3757acc72cf4e779ff0c3435786b352d1f SHA512 828d54ed8f997b912e5d6776935e8e825fe5b724ab0c11fd52a3401288128ade82efd07d9404e3d540cd74cfc506895133758fc69d190c87f6d507eae259a4e9
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.25.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.25.1-r2.ebuild
deleted file mode 100644
index 1baed2068e2b..000000000000
--- a/dev-python/m2crypto/m2crypto-0.25.1-r2.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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-python/typing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.28:0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.26.0.ebuild b/dev-python/m2crypto/m2crypto-0.26.0.ebuild
deleted file mode 100644
index ddeeae5c89f3..000000000000
--- a/dev-python/m2crypto/m2crypto-0.26.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-python/typing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.28:0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-python_compile() {
-	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.26.4.ebuild b/dev-python/m2crypto/m2crypto-0.26.4.ebuild
deleted file mode 100644
index 796dc719dd4a..000000000000
--- a/dev-python/m2crypto/m2crypto-0.26.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl:0= )
-	dev-python/typing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.28:0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-python_compile() {
-	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index c338f7d864c6..5f9678fdb543 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,8 +1,6 @@
 AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
-DIST Mako-1.0.0.tar.gz 470006 BLAKE2B d2777564387730c3899215a4f707a1e17c5a993f81fb19b0c5eeba708a0fd137e0dcc2c52409e266524371c459cbee25171bcefdbc650650ff70aec2c54d41de SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
-EBUILD mako-1.0.0.ebuild 1466 BLAKE2B e8335e8282e052b16da1a6024ff4f3cf891fa2e86c4bab9152766ea4a2a0f2930533177bc5fdaafe43cfe35678186a59bad7d2f3521b3c4fceb2c273d745f64c SHA512 4efcb883a90a92fc82ee4cbbc7a976d76732b869fc669c3b978e34c6e1a98afafea58b16d1a2c553728dd9f2d360313c9fd35d5554a97b2a53d6e7be74a40b70
 EBUILD mako-1.0.3.ebuild 1415 BLAKE2B db5d44fc7c9bbf403be19bc104fc4223bfa369825cc1844049fc782701aea5d4651a8a5f29633846730970baed13d6c240251c0e5ac3f5d77748dd26b5d9046a SHA512 659bbf5a8f48dd5bc8f8a2e5ab2dd3a0c770566c8087304a9b721f8a44aa40f207b1faf6570dd690c936e498619840f8faee9f48437a64c91e23f29e6bf9c125
 EBUILD mako-1.0.6.ebuild 1475 BLAKE2B 6d9d05bd252e06d55a49253873386669119ddda25915fe3711518fa525d88de70fce6bbcf6e750bf2a5ab5af2c5479949ed590351ffac1824113e53c6348fc9c SHA512 87c0cf382124cc4df200dc1693241e45fe2c6ef6af1e61d63b07984207c19ab0015783c853a6eb96e23a5e621b1e880e857b08a77e34f1b663f366852fe57013
 MISC metadata.xml 317 BLAKE2B 1b8ed4d3958df0960dda7060ead69fff4ea6f0c6087d99af4ceeeb8d1fae9a88657aec6eb1695ec5f990e48f167e729ce65507080ef0ea5d23617d439621921d SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8
diff --git a/dev-python/mako/mako-1.0.0.ebuild b/dev-python/mako/mako-1.0.0.ebuild
deleted file mode 100644
index 6b8880fc9434..000000000000
--- a/dev-python/mako/mako-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +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 readme.gentoo versionator distutils-r1
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
-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 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOC_CONTENTS="
-${PN} can be enhanced with caching by dev-python/beaker"
-
-python_test() {
-	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -rf doc/build
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.7.3-r2 $v; then
-			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
-			ewarn "If you rely on it, you should add beaker to your world"
-			ewarn "file:"
-			ewarn "# emerge --noreplace beaker"
-			break
-		fi
-	done
-}
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 7d635ba75b37..23a71b4bece7 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,8 +1,6 @@
 AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
-DIST Markdown-2.6.1.tar.gz 298074 BLAKE2B a02c80d34793d480a6872e304ade7436738bfdbb675f46225a6b6807a5e584b7132070ccc4617bce23106b53315acf1f2d933005b402fe6735179fec97d13f0b SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78
 DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376386c27355f386de8a0dd89e2bf0c1d6cadb0ff937fa3825655ab6220901f7b17ea2d184f3b3d178cbb54af58b8 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
-EBUILD markdown-2.6.1.ebuild 1262 BLAKE2B 00d62a618cca711ddeb1979dd00c5d486382d16c46d213d23fd8e9f764e75294bc4a04667dd16ecfdf25aa7a7adccbada7adb8623e7a7ebf6b8aaeacacef4bbf SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
 EBUILD markdown-2.6.8.ebuild 1450 BLAKE2B 7ecdca2c60e14805a9feab28e8e256e4e8899fa61f31801df6c2147e6eec27634dbd74b261723b87ed3d8519be1f85ac0eff3e8c48b8168c6a5250873f03eca0 SHA512 d2b5c9d78508707d6ede1b8fbf631733ce50be6d1adc43a1162e91341e17d608c5759504671bbaeafdb389dafca052e6e7ed6183cf6436ebd048cbaa760fcf7f
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.1.ebuild b/dev-python/markdown/markdown-2.6.1.ebuild
deleted file mode 100644
index f1817a405d00..000000000000
--- a/dev-python/markdown/markdown-2.6.1.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=( python{2_7,3_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"
-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}] )"
-# 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
-	pushd "${BUILD_DIR}" > /dev/null
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null
-}
-
-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/markups/Manifest b/dev-python/markups/Manifest
index 7d291fa03836..ec808809c958 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,7 +1,3 @@
-DIST Markups-0.2.4.tar.gz 8827 BLAKE2B ac58b60afa1c1b98e5f3871fb4412e1e5c143882d5171e8a060bb5ea5ef70304bc2b00e8365f602253cd0d0f536110aac0f2972ad2d1104da18b45d2b965822e SHA512 369eda02474f723d694bc0518324afde9f5baef02719448abb420a77d58cf1543939e6d38aa1db531d4214dc4cd4c47b29d79fa7a23b33b4ae74b45ad2ec52c7
-DIST Markups-1.0.1.tar.gz 14894 BLAKE2B 4b97689573f62277d86a09cee6647ccb2e4e8e6c1e44fcf7a9c56edad58774c970c9d3c97aaa7a3564466b0633ade5cc7e81f6f29529c08c5ea2a8fa4a3729ff SHA512 f57f712f84413ed35f53643533d392e2164de02742e170f85fc4556094041ffa16ed1ff6d902bcafe996d22a4410e4c2794e4c96246fc06afbf878d6be85cf31
 DIST Markups-2.0.0.tar.gz 16772 BLAKE2B 88091cbdb6dc5c7289561e4ff8d585335f13ece27ff62951d7356bb89b35e09b8eeafb960583f9dd5faa5fbe9cdb6961523a5314bca8c78e2f0f80514f28595a SHA512 8ccd348efea68678bfb7f47bd13da2729f95a5b5a8d44f11239dbb86b8224867cb1197e46d875ab9a0ba914be004bdc9aa6848b1e6549dc53b12e06040faaaae
-EBUILD markups-0.2.4-r1.ebuild 811 BLAKE2B 9d59e7035341326a6f281051898d50e433b5936816bd76d33f441093b2d271d5174beb5afd257542b00e48287aa5576fd9f36da6a6719eb8e263ee9db6792a47 SHA512 f14db2c6e7adf268b46646c05c89211d74bd865cc15f705e300dbccc6e7289946f953fb94f158bf5e96af7aea5eb14f287a3b06642c70e22c9ea02c5338343aa
-EBUILD markups-1.0.1.ebuild 662 BLAKE2B 67d8252130e32503cbca83b927191c01c2e3754af24fc55f1faa660cc7bf42b363615e160d2bd558a60710623aee7fcf2dc2d52bd95aab9e7c9949a73d609bef SHA512 4b810b5998505ab8403c851ececcac3e1a13426d896033f20a9e3247e7036110fa1f7d834ab2f6a7d519f18d441be42185da7237cc0d034931020d64b1b9dbd0
 EBUILD markups-2.0.0.ebuild 664 BLAKE2B 6f1dc1024ec134f16ac14dd657c744db867f86af2e796b9d819a2b5f941957162198fbedeeea537f3da55ecfb4183766a7558fb40bae681a35cd1bbcae836a98 SHA512 736edb5418e55ac3d9a48a657b51d48c5a066992167e86456b827cd4c53aff17ae1604bc80ffcd34a2c6b35b925c530554930eb52fb4f73c703d93250223f01a
 MISC metadata.xml 386 BLAKE2B 97330ae5dbda375442d15b60796eac606016d0c4b9f2d4f5acaf689e3b675336a302d0bdf795b538ff0f3f8577914a8cff32e624c2c2c07f10237f9292f9ac6c SHA512 3b8b537f5f944976cb1190822427b4c82af3fae92ad3b6a3505a2327a4da78c5eb0133adf6a0e4470ee27affb6787d1aa3a4443f7eec79a5e16a3684d01a6c3a
diff --git a/dev-python/markups/markups-0.2.4-r1.ebuild b/dev-python/markups/markups-0.2.4-r1.ebuild
deleted file mode 100644
index 7c40377906c1..000000000000
--- a/dev-python/markups/markups-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,34 +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
-
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="https://pypi.python.org/pypi/Markups"
-SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}"/${MY_P}
-
-DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	pushd tests > /dev/null
-		for test in test_*.py ; do
-			local testName="$(echo ${test} | sed 's/test_\(.*\).py/\1/g')"
-			einfo "Running test '${testName}' with '${EPYTHON}'."
-			${EPYTHON} ${test} || die "Test '${testName}' with '${EPYTHON}' failed."
-		done
-	popd tests > /dev/null
-}
diff --git a/dev-python/markups/markups-1.0.1.ebuild b/dev-python/markups/markups-1.0.1.ebuild
deleted file mode 100644
index 745a9abcb2c7..000000000000
--- a/dev-python/markups/markups-1.0.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 pypy )
-
-inherit distutils-r1
-
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	http://pythonhosted.org/Markups/
-	https://github.com/retext-project/pymarkups
-	https://pypi.python.org/pypi/Markups"
-SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/${MY_P}
-
-DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	${EPYTHON} -m unittest discover -s tests -v || die
-}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index af0d5abfd6d7..72ca70bf370b 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,19 +2,9 @@ AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 BLAKE2B 2eb3148d1f5d13380af
 AUX matplotlib-1.4.3-cross-compile-1.patch 1779 BLAKE2B 6d95661d0300976064cca5f21020d3642d65ecfdbc74458bcb9aa82ecef7490869be4b97110726431f52385ba967d09d28b0c7c040cc4b07997ef758c83dfc0e SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d
 AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec7bfd35c9b51644662c548279c6e05f72d1c626625525d0600c89bc4e00827b3f1de777f76ac626f51bd448a4a0478cadb8bf6810 SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824
 AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
-AUX matplotlib-1.5.3-freetype-spurious-failure.patch 1061 BLAKE2B 04f31f3ac5f33b43d84e3df8011a7e17fefe5f11cb791968b8ab23e6d6f61b38d62738fd806f692b9f8e5b3b67444f9da2455c84ea5ba6affb46c7d77250786f SHA512 3cae61f9f6fcad1f2c8f47d7489a4ab54406118deaa8993b2a82c65bac8d21dc733f8c46b7f59d4a1961c643035b0b95d0c906f9388865e5036b12ff5abbbc32
-AUX matplotlib-2.0.2-freetype-spurious-failure.patch 1318 BLAKE2B 6cd2760c3428235f9c4881022a5e15ee4d03c17ecfdbd7b2afb0fdd6595c96fa9df3aad2a52bf2383cb8b07c8289fa5d4e90c518d863ec977e484baf4e768e73 SHA512 2c9de58cf652bb8eb95099410ecc7ea0229e06edefed5159470addfb6c76435ce1e5b682d5b6335fdcc4d522c6b8da1bac3c79046db984a20de8f58736796fba
-AUX matplotlib-2.0.2-nose-fixes.patch 586 BLAKE2B 5bab575f4f5f6f5d339a64bb581544f4a75c90db803f754123811bc5c2d45f725f396c697d0567aabdc8ba0aac66208bb3fa2f3430cfd2acbeddad2357d2ef7e SHA512 85056ca6bfc91317d44c157838e21902085efcbde688ac977b634916525f1787b7f370b2e19e957589d3872dc05987c13cd6b9b4aee0dbc5aa661a0bbd2990fd
 DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
-DIST matplotlib-1.5.3.tar.gz 51606089 BLAKE2B 6ec475298dc74082f66fa8aa8711b402503a1ce1d689e8617f9442f8857ef516bc5c9814c47d10d959e8aea365deee3f38962ce04c7318f3aa79d3d53bbb804e SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385
-DIST matplotlib-2.0.2.tar.gz 53879938 BLAKE2B bf20503715a5b97f3666d6ea601850483250e72f2910ee94f7c4bbe59740827b5eb96a96b8992a5ecca7a523237d1f018b2d339d3d39fff9c6d0c9675ab27e48 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f
 DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
-DIST matplotlib-2.1.0.tar.gz 35727251 BLAKE2B cac5cfd740066a0d9fc1fd0ad791c134e86b26359e483f0216d9efd36178a8776513e853d41ff231823cd5c54a3251727e21cd03c89149d85cb4a096f4179f32 SHA512 8f512400f1f15d5400e23dd8e402783c54f62567d412863530a982c6513206d49fb91fadb3ef477648a4a38d6dd032eb90741ff4495d2be71911f83677d768b4
 EBUILD matplotlib-1.4.3.ebuild 6150 BLAKE2B ab34b10ad72a013c9ccae7c6b34b2f624169c44df8a149dde10a6fb5448f928bdfb107e39cc220b54c5460be1645d3bcbf8278a37b20f3906776aa0f2094b715 SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46
-EBUILD matplotlib-1.5.3-r1.ebuild 6411 BLAKE2B f47a928be47a5dc2ae273c604ef59ab11ae62645f4dc89e5c58c03d57c51684d2404d00774efe0a1b0f728211f66cc38f6490ac72780126b049f8743afc2d480 SHA512 2b82734df065dd850ab99e4a19ed8001c45f9f9a472c54b29930f2b2447b77a2b5b2538c75d8c940d1fc5ffa774ddcb85b065bca923e9a46c4feacab0c3764af
-EBUILD matplotlib-1.5.3-r2.ebuild 6559 BLAKE2B 8dc8a2c7a3b209e2d140e07ee028408ea58a22dc78bcc7c4fee30a88064246a45a855c475628d2c686bc141beb9de3b46908705c416e34d1e26a95688903ad5a SHA512 00b3fc17023fa04a4e7dc35e3c5752f0e4b16ca1edd21138448ea9e44d843762b7111a018b002fea762b6c6914f1171d72054da52427572c25d87f1c2157c537
-EBUILD matplotlib-2.0.2.ebuild 6182 BLAKE2B b8cb2c989aea9c05c299ed75eaf8e8cf2ee149c1685c004675041d5e98107764a917d25108ebb92fa321442828f380e95016e13f5b779131c042b23a521893f4 SHA512 ab6b634f44041f3dc17615acece6bd8066842c42203a28bad2dca4923ac3ea969eb57354f59aac417f575aaee2c6d2f77ec0384dab08ee6776106d7971078f66
 EBUILD matplotlib-2.1.0-r1.ebuild 6047 BLAKE2B 21a9b0036c9df905a788168d1a76a433d95076ada0df4bcb570c53fd9a552ab6dfdd549c3bf40e59b2f794d196493426037e45fa7be9ab0a810651d674221399 SHA512 1c3cab34e2208430f6053195f28798b90fcafe594116589d454c71ddc465ca444747b9c7b79c3452c8947a87d9549c5bfcf50120e9093cbe8acbd2320bcf0d0b
-EBUILD matplotlib-2.1.0.ebuild 6071 BLAKE2B 854eaebd793e652c2a3cec839b8e020998a0e76da165de5e820e3c3553da90252f823ab71368e40435dfa4ff51bbb1dfc2728a8e887a1012b6fb2984288e2af4 SHA512 fe2f89b32566e3dc4574aa950a059b4083692c064424bab96ba732baa58449366504401366815be64b981be5eafa9957c14c4f57ba9b1c0a76a2eb96acbdf404
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
deleted file mode 100644
index bc6891a5f252..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Increase the tolerance margin in order to pass tests caused by
-freetype producing unreproducible images across different versions.
-See also: https://github.com/matplotlib/matplotlib/issues/2667
-
---- a/lib/matplotlib/tests/test_mathtext.py
-+++ b/lib/matplotlib/tests/test_mathtext.py
-@@ -158,7 +158,7 @@
- def make_set(basename, fontset, tests, extensions=None):
-     def make_test(filename, test):
-         @image_comparison(baseline_images=[filename], extensions=extensions,
--                          tol=32)
-+                          tol=40)
-         def single_test():
-             matplotlib.rcParams['mathtext.fontset'] = fontset
-             fig = plt.figure(figsize=(5.25, 0.75))
---- a/lib/matplotlib/tests/test_text.py
-+++ b/lib/matplotlib/tests/test_text.py
-@@ -18,7 +18,7 @@
- from matplotlib.backends.backend_agg import RendererAgg
- 
- 
--@image_comparison(baseline_images=['font_styles'])
-+@image_comparison(baseline_images=['font_styles'], tol=20)
- def test_font_styles():
-     from matplotlib import _get_data_path
-     data_path = _get_data_path()
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
deleted file mode 100644
index b6450a83fed0..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
-index 5e738ad9b..78b3f8169 100644
---- a/lib/matplotlib/testing/decorators.py
-+++ b/lib/matplotlib/testing/decorators.py
-@@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest):
- 
-                 yield do_test, fignum, actual_fname, expected_fname
- 
--def image_comparison(baseline_images=None, extensions=None, tol=0,
-+def image_comparison(baseline_images=None, extensions=None, tol=20,
-                      freetype_version=None, remove_text=False,
-                      savefig_kwarg=None, style='_classic_test'):
-     """
-diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index 39f5d7ef1..7681e5cb9 100644
---- a/lib/matplotlib/tests/test_mathtext.py
-+++ b/lib/matplotlib/tests/test_mathtext.py
-@@ -159,7 +159,8 @@ for fonts, chars in font_test_specs:
- 
- def make_set(basename, fontset, tests, extensions=None):
-     def make_test(filename, test):
--        @image_comparison(baseline_images=[filename], extensions=extensions)
-+        @image_comparison(baseline_images=[filename], extensions=extensions,
-+                          tol=40)
-         def single_test():
-             matplotlib.rcParams['mathtext.fontset'] = fontset
-             fig = plt.figure(figsize=(5.25, 0.75))
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
deleted file mode 100644
index ab1181bd0176..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 530c889a9..8231c2bb8 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1609,7 +1609,7 @@ def test(verbosity=1):
- 
-         # store the old values before overriding
-         plugins = _get_extra_test_plugins()
--        plugins.extend([plugin() for plugin in nose.plugins.builtin.plugins])
-+        plugins.extend(nose.plugins.builtin.plugins)
- 
-         manager = PluginManager(plugins=[x() for x in plugins])
-         config = nose.config.Config(verbosity=verbosity, plugins=manager)
diff --git a/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild b/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
deleted file mode 100644
index 11acf166d286..000000000000
--- a/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,263 +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='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://pypi/${PN:0:1}/${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/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}/${PN}-1.5.3-freetype-spurious-failure.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 || die
-		[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 || die
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			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 \
-		"${EPYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-#	virtx ${EPYTHON} tests.py \
-#		--no-pep8 \
-#		--no-network \
-#		--verbose \
-#		--processes=$(makeopts_jobs)
-
-	virtx "${EPYTHON}" -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/matplotlib/matplotlib-1.5.3-r2.ebuild b/dev-python/matplotlib/matplotlib-1.5.3-r2.ebuild
deleted file mode 100644
index 9b22ea3ab8c3..000000000000
--- a/dev-python/matplotlib/matplotlib-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,269 +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='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://pypi/${PN:0:1}/${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/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}/${PN}-1.5.3-freetype-spurious-failure.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 || die
-		[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 || die
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			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 \
-		"${EPYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-#	virtx ${EPYTHON} tests.py \
-#		--no-pep8 \
-#		--no-network \
-#		--verbose \
-#		--processes=$(makeopts_jobs)
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-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
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-2.0.2.ebuild b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
deleted file mode 100644
index e8214110ebfe..000000000000
--- a/dev-python/matplotlib/matplotlib-2.0.2.ebuild
+++ /dev/null
@@ -1,256 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${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 ~arm64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 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/functools32[${PY2_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	dev-python/subprocess32[${PY2_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	cairo? ( 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/colorspacious[${PYTHON_USEDEP}]
-		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}] )
-	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}-nose-fixes.patch
-	"${FILESDIR}"/${P}-freetype-spurious-failure.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"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	rm -r extern/qhull || 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 || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(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 || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-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 \
-		"${EPYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-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
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-2.1.0.ebuild b/dev-python/matplotlib/matplotlib-2.1.0.ebuild
deleted file mode 100644
index 766e5f93a001..000000000000
--- a/dev-python/matplotlib/matplotlib-2.1.0.ebuild
+++ /dev/null
@@ -1,250 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${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 ~arm64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 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/functools32[${PY2_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	dev-python/subprocess32[${PY2_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	cairo? ( 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/colorspacious[${PYTHON_USEDEP}]
-		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/backports-functools-lru-cache[${PY2_USEDEP}]
-		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}] )
-	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}] )
-	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"
-
-	hprefixify setupext.py
-
-	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 || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup pyside)
-		$(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 || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-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 \
-		"${EPYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-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
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index bd46f42367f2..1ddc5bcfa6d9 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,5 +1,3 @@
-DIST memory_profiler-0.43.tar.gz 31496 BLAKE2B 0ceb901c94ac205e869323dd98364fd7cfaa21e56578221d16d416ed03bbb8a08ef7036c28da37c3f2aebf0b070ff198dacde7bc185ee276a3f2bc3e5955dc7c SHA512 6c0bbece0b2a7da5504e878db3777ae86009ed3730a00527af457e4c216e7f5423feee79216bf28496374a2a597fd0cc2b267a312587ed01ac42f6ec3351eca6
 DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
-EBUILD memory_profiler-0.43.ebuild 1238 BLAKE2B 23139274d6640dba5558da7dff27f6d64050afe61164d125d9623bb6ad71093835d7d93b6206f17ebdedfa077a47242d1ddda1361df4b46d4c57a4278c2db7cb SHA512 ab34990a5eaefc1521132c218bbf6f2ed8aa61dba925755c4cc60bf5686a002b7d5c8d7f2be07011632b74555f54e4bb1ccd4be70112293815b45aae5e1e7270
 EBUILD memory_profiler-0.47.ebuild 1238 BLAKE2B 23139274d6640dba5558da7dff27f6d64050afe61164d125d9623bb6ad71093835d7d93b6206f17ebdedfa077a47242d1ddda1361df4b46d4c57a4278c2db7cb SHA512 ab34990a5eaefc1521132c218bbf6f2ed8aa61dba925755c4cc60bf5686a002b7d5c8d7f2be07011632b74555f54e4bb1ccd4be70112293815b45aae5e1e7270
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.43.ebuild b/dev-python/memory_profiler/memory_profiler-0.43.ebuild
deleted file mode 100644
index 046f424b099d..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.43.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_global.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	if python_is_python3; then
-		${EPYTHON} -m memory_profiler test/test_unicode.py || die
-	fi
-	${PYTHON} test/test_tracemalloc.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_precision_import.py || die
-}
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index 570d24b1a80f..f855895b8ba3 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,5 +1,3 @@
-DIST mimerender-0.5.5.tar.gz 6420 BLAKE2B 2275095089eb08b8a33f8cc711345ca48ff79a633b2b372a5c6afa3ec288e9e3ea5a0f70b08ca78da41fe1370ddce1defe3cce96cf0d56fee1c79f14622ec153 SHA512 35f52ad6c46ec7e37c44be67e52140f19a3def526546a7a370c0b19d4a43e01e213fdb4673c17449de0951066ae208a1f3f70577713242b078eb7080f62f4b24
 DIST mimerender-0.6.0.tar.gz 5310 BLAKE2B 92ff2e9dd8544ce64eb00fea230eb5d827cdd76856eb4ec7962ab706081e4e96b97e4bbb1a9131a37d643205e92ec9afb6b2b6b462fddc025a07d201b946eef9 SHA512 0b0f452404d09860cf42b8afef96ac87d4e5b222834b2309a9aa8d4855822b988cc8daaa2a0553332786755a26ff8e65c8cd6fbd4ff390f8534f925524b4222f
-EBUILD mimerender-0.5.5.ebuild 546 BLAKE2B 8d1fa1f7bdbb1b04a38c61ea3cc557ab1215462fa57d4437eaae13e660444ef02e4582fbc6d2b1e6a43d13d111d79e38e354ea775393f69d99bdcafbdb3955ee SHA512 cd8d5aa5f7d046adca65869af970ec2eb39806cb88bb751bdbe6fe58a482121fe05cb3c0057d9fdd0f642df73d69edd3302d3ab3e4cbb0ee76ec1fb4f7366638
 EBUILD mimerender-0.6.0.ebuild 554 BLAKE2B c998de43952c10f6918ec847fe28635034663fd1f2175977be6f2875fc555a3c755e32f6d7b1a39a67d5edb4be6c774d347965b8a1c119f67a01e2e6b44c2516 SHA512 d5cde68c87d1a774b238b1b89dfa6ba1143100d926749a9cec0c79b1791aff9f94ced8fd6c8d43aa80861c23d56c0c41082a991f602413996de74b170f3225d1
 MISC metadata.xml 313 BLAKE2B 0af0e6a1a8f423a445bf88ca13d771c3dc7a8e7db97d21446a5c5b7967dc232a18c1062ef01e11dfabea9fe47c36825bb2cf44bac98ef651cbfb5d941cf281ae SHA512 69420483f170abf2482ef947c26bbe7dacda158cc222464d35d18b702694b73b6205fc4d66150265962e28ba1965f7c555ea033778fb04eff73a58ef804e157d
diff --git a/dev-python/mimerender/mimerender-0.5.5.ebuild b/dev-python/mimerender/mimerender-0.5.5.ebuild
deleted file mode 100644
index c48543330399..000000000000
--- a/dev-python/mimerender/mimerender-0.5.5.ebuild
+++ /dev/null
@@ -1,19 +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="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.python.org/pypi/mimerender"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 15eb7e5f9ed4..cc28fe18ef0c 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,5 +1,3 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
-DIST mongoengine-0.8.3.tar.gz 219978 BLAKE2B cf19e8baa6945a0a79e777544361df555e6da848f9479f44e5c52e5f8a2331fcf2b01fbc547e1e1a5ec96ffd50485cb04cc46cb59ac0372109b56bd0021a7c3c SHA512 b77c36ae008fb31f26a60135fbba3a9cf08375506a760daa3fe9e2558a6c67f4ea769eccf7c472c9ddef900fe50548aca00a81d0e666b007398b31cb4d32e368
 EBUILD mongoengine-0.10.6.ebuild 816 BLAKE2B e38482a3396d9e6a346a9a922ce30ba611de15f15201875c1d5f5f593c5ba0def167825ae6d26e1b6d7697bdc1ab1b859339118ebf7fb468563d9b67edd4b10f SHA512 b8e3a56d6bfb7d416e9bb761a87627dcbc6e850dafd6d316e6f1db2b914dd4fcbb67672f49c327e3bec1216f226ef4996b4c75a8bde2b8f6f8a91f6b5af0f6bc
-EBUILD mongoengine-0.8.3.ebuild 776 BLAKE2B 0871fa128427ff866930accb2eeec2f9dbca7f36cbe0445ea3360269d4fa92f441a5e14e14d4b78f17ec543783055360f989d9037eaf3e6ea5ba6378f118026c SHA512 e2326aee8f4b766a24168014326110152d24e073c988617e96dac7870426b79033c23c83ab500384c9fd5d778afc260e92a95ee3ec71cc28d97a9d9362355997
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.8.3.ebuild b/dev-python/mongoengine/mongoengine-0.8.3.ebuild
deleted file mode 100644
index 90c2e7758637..000000000000
--- a/dev-python/mongoengine/mongoengine-0.8.3.ebuild
+++ /dev/null
@@ -1,32 +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
-
-RESTRICT="test" # connects to local DB and other nonsense
-
-DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
-HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
-SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	"
-
-src_prepare() {
-	sed -i -e 's/tests/tests*/g' setup.py || die "Failed to fix test removal thingy"
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 1217a71d830d..817d55026762 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,6 +1,3 @@
-DIST more-itertools-2.2.tar.gz 19807 BLAKE2B dc84769a7b9bb38124b3781e4d75b0dcdacd408fb2283cc4001c4965f4ef80c91b780e6071d5a8f81a8c10d82063e7826e12a3f0b0cc308296e77790028b39bf SHA512 579a778b91607800c4000a30c7509e9fc44ad1d35598ab9041b547aca9d94b811d3fc0abf5c84413fb70be87eb20177685a8a30dc7146a005fa1eb82986294f8
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
-EBUILD more-itertools-2.2-r1.ebuild 847 BLAKE2B 7e930048017e959f7c560d1c5c06d63624752dc140d191ea2704e3d7eb8f50cf78c6f14bb7355af26ec788198082024773345ef5cc9028a7140c339b78934a3e SHA512 c67d4cbfc5ae1a47108ec059f1889bd051b9234b8403ab1a98ed61423e7e6312733fc3398c4039d75775295e682e8e212f887943395016ecfbfa9fd844a06845
-EBUILD more-itertools-2.2.ebuild 435 BLAKE2B ce5021e3d905d6ed1a1c61f2a3f75a47952eee45c9114476be79ff6f94fe4795f0872cb1cc396315c50d0be946b6499a3682117b2cab7291edf978a545389e33 SHA512 c7fd58b1a94f6fbe85f94ce955b07dae86f8310d22d9307728cb6cb7c812b821a57735e409722c4aab2c7cf79b16433691f08e3d86ec1353ada87c2cc3dc04ed
 EBUILD more-itertools-3.0.0.ebuild 927 BLAKE2B ff00c65dbe228df221be9e8b3473ef9b18ff076ae4799dd054896a3abfe04633cd371040fe555c45862cabf4cec8c098fc3e8eeb0b936e4e76fad98d04fb4f78 SHA512 17f7d60010f0be40b8ed8b1b5d4643f1b9790444e5f3fd75a01e3195dab2e43233429862680a63c0d505d74b3019f125eb7ac540d35d82a751b6d15557df10d5
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-2.2-r1.ebuild b/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
deleted file mode 100644
index 6220729e1d71..000000000000
--- a/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}] )
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}" more_itertools --with-doctest \
-		|| 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/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
deleted file mode 100644
index 21b21ab2479c..000000000000
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index cdce0e8e6de0..e64c113f5871 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,7 +1,5 @@
-DIST moto-0.4.22.tar.gz 192878 BLAKE2B edb06dd3271aadc067bd2f3fffe5b388f68d0be18f727c893eb9589bc5874072d274dbc726a8f000c482ef5dae4e6ade52a606e6a314a305c58959198aabedd5 SHA512 7a5f1f43dbf6202696705c52a35fde4e046febd403b1e1b0a7e98ae25e881c6a86c29d2f27841db5ce8fe34689cd00ff4d2d711cbfc8817723d2dfa675379f8c
 DIST moto-0.4.30.tar.gz 614008 BLAKE2B 2868ab25414e488299cb521ce814239698466d69e806245fd86ceb9d5835d08fa530f2da0a5a16f595a88b3c0e421cc264f361bc68d31841726896826240fbab SHA512 ece27979911f46adbb0aec9aa3755b13c09ced00b24ea136ab9c8a8a992550e9c38dac15d8b0c71822953f070761083253ee5fb5cbe44a4b108d140ab4407699
 DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
-EBUILD moto-0.4.22-r1.ebuild 890 BLAKE2B 3c5d2a624c1ba372cf32d19acfe72210285340c745b9f4053aea42a1f3ba31280300c540c99549847272e516febcad7f870f2bd6f5f40b429dc45c7b768f8f04 SHA512 9265c9f325bafa008a2cf07ef2d7ba5463d9365824804feb04bf1fbdcfffa7eb826295469b770158b23520cdc68072c53de427f11b9aa35a73a399700fe4229e
 EBUILD moto-0.4.30.ebuild 864 BLAKE2B 31d4b836d88f7fb4840e4a7f8269e63020e60e7e362a9f66f7b62b5497393011fee2572397d1399e1de65349f9c9656fbb5e8eeb4f5142b9efb8ee3c5885afe8 SHA512 f3b3caf523b23b97dfbbd546192342db6b2f802d1a263ecc0022144aa0182f13be7272c319c3894ddf770be926cc43f23cd525b00aa503fa1ec5c113fff6b1e8
 EBUILD moto-1.0.1-r1.ebuild 1291 BLAKE2B 9c46c7d3d8537bed88019a36f86ebf2a208c568894e582f4bdb9e482cef934eb23edb7a18550b6897f65cdc696df53db9c9f14477399f8078bff05c47fdbcef5 SHA512 788e0d7f68107e8558d0222de4b3fd0ae523fc96ffff40b752c6dca4b13ecbff1bd0c18318eacfa2372a4d11aaad4d3bd5ec7f63041712d993434c91f8148e9f
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-0.4.22-r1.ebuild b/dev-python/moto/moto-0.4.22-r1.ebuild
deleted file mode 100644
index 7f7c6c56b9f9..000000000000
--- a/dev-python/moto/moto-0.4.22-r1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.20.0[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/httpretty-0.8.10[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "s/httpretty==0.8.10/httpretty>=0.8.10/" -i setup.py
-
-}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index e3530a383f25..4fb3cd2e0550 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,3 @@
-DIST mysqlclient-1.3.10.tar.gz 82102 BLAKE2B de79d3a80c177b1b8a3f0c4f4e74111dcf78b76a2fb07207e8b79f07752e482db581dc9af4745fa4c7ef401eb2c7fcb88677af39c17fd0c5d1a47dfdc50ef0d6 SHA512 05924b363431e1208c39d4ee39199b06f29025e4fb2abdba5b85e2755d7a69ff921752754700ad34118ce6502ab654eb3e46192b5085f5fb5dca1ac46eaa412e
 DIST mysqlclient-1.3.12.tar.gz 89793 BLAKE2B 7dbd582b72b27a71a4fa7a6fd9f051eee7f1d820d447cd5463d4060725f3f779e5bb91500aeaf9d11460f0d72c76732fc610dbd1555c6eb5a0ba55ca3e870c03 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee
-EBUILD mysqlclient-1.3.10.ebuild 837 BLAKE2B b95b113b015580c07d06c307e0867a44fa1ef7ed0b6a0f61b1458f887640cd5e9d5e723829a9af9039884b2fd0e28e371416e0285476e989a7c969e3f77e98d8 SHA512 48c075666a945f077def5f5848a5c86be3fd4c701e1a99e9af2b968d87b606051bd5df78be8ae6d844f7d9ea0ac9ea968b40a7bf91d4feec8948edc181d38350
 EBUILD mysqlclient-1.3.12.ebuild 837 BLAKE2B b95b113b015580c07d06c307e0867a44fa1ef7ed0b6a0f61b1458f887640cd5e9d5e723829a9af9039884b2fd0e28e371416e0285476e989a7c969e3f77e98d8 SHA512 48c075666a945f077def5f5848a5c86be3fd4c701e1a99e9af2b968d87b606051bd5df78be8ae6d844f7d9ea0ac9ea968b40a7bf91d4feec8948edc181d38350
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
deleted file mode 100644
index 5246b1ba5d40..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
+++ /dev/null
@@ -1,35 +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="Fork of MySQL-python"
-HOMEPAGE="https://pypi.python.org/pypi/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index f7998c59be4f..e3ef1dafc799 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -2,5 +2,4 @@ DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd8425
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 EBUILD ndg-httpsclient-0.4.0.ebuild 823 BLAKE2B 2dc547a9f3cca10791e6975fe2ccf5f51120bac9706da015ac4977037f1e04ce078e1d3ddb9a90f1e936700677b5742c6b2e56e96fdb23e02fcfde7a3fcbc096 SHA512 cbeea7a47e532cc6313b7e1f61de0decfba3d32eeb102445b17090b65b1d70532ec12217734fcc4d548025017f281eceaf8576f2e2dd29d694f7f17583ca1dcb
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1652 BLAKE2B 090d28de93caf29e7a13b5c905788e3ecfd623f59b71203f96f0a4c174b8ba345d821d95445b9d8f2af4800001566d7cc3858e09d7ec83e44c089e9ca2a29efe SHA512 583d41b0868e6e25d0d7424ab6cfed2d6b6b51851d8a84e64c6871b0bbb33151aac83feedb6033cc78696c419cb516d6c4cb51040ec59ec6c045f39c3aec311e
-EBUILD ndg-httpsclient-0.4.2.ebuild 848 BLAKE2B ac891c29c8a14565b4403448a62312dffc7f6c92cbc5e2b24b2df3fad441f02686982adfebbe11a5d5f7e93b7959fef652699ec7d81e20f639cad3635b73228b SHA512 a1cdf1a1498007e50d40d17e2c2c6b4ba521250b89016c9dd6cf63fb1c76fe72480b952e228d8156a155f4dbef4ea7fa57c309f9404e9704980eb1b6cf08e993
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2.ebuild
deleted file mode 100644
index 63a3b925a3f9..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.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
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.python.org/pypi/ndg-httpsclient"
-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=""
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 8ac733a73852..5eb00e4df69c 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,5 +1,7 @@
 DIST neovim-python-client-0.1.13.tar.gz 41413 BLAKE2B 819c3e7763cfb357d45130928dab23ad149a5f9d8efb0df8699a805bc394662447837ad3edc869705a95d74a37f2eec4f155212da918ac779d389c150a0d7189 SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b
 DIST neovim-python-client-0.1.9.tar.gz 40599 BLAKE2B 48b43d344ed0c7aa3faa95a16c9714f2d105a916364db55d68263db7b8307a90d084bcf7559dd17277bb8dfbe6d7bbab8d3dafa250b4825b2cebddc00d130dee SHA512 043429407d140b37004d5344f9244c8cb5a37e2b5d450454e6535bece7fb05f037e5eff2a63431fad55ab2470372c4a17e0a608a94af65a2f400f2158b736ce4
-EBUILD neovim-python-client-0.1.13.ebuild 826 BLAKE2B cd220761777c12e535a321110ba93c838e75d70d9f320ba37874815ffb5ee97ffaef97ba78cd043b7c3ce3061cfa684d618b67af3b01a6271e4df80e1ca3e1a4 SHA512 2f26bd876a38955b833aca3875ce885755dc25b3a235aab9842a1dc300d6022886cba985362fcf5f0245d6124b34dadd5a1add3baaeaece335849df8e23fe3d5
+DIST neovim-python-client-0.2.0.tar.gz 41892 BLAKE2B 0ae59548ae1e376c618c24edfa73f3f68f5c059b2772be8ba3aae08d38c7a368d8b341da0221092ec8fb132843e1ea2d313bedf0c51fd202d5953e530f205d3a SHA512 b8363be2892f4dfaed0251186a3f370ec31be51710b659b71f52575da773e254b388afec2f5999a6b526d722b5232a16c59d7e28e49df30b4760ef030238d068
+EBUILD neovim-python-client-0.1.13.ebuild 831 BLAKE2B ad09ed46b91a3863d826ee34e761b120bd9b0ef3a8f68789bc765f81d93d61226ad46eaaaf748b060c1b7722306c20253115fd2a0395b1e23524247ae643d799 SHA512 33fc3afb3c9a748b186b9fc0500ce52aa438cc39016d0eadc2be78161dd41db39864aee88fb59f36b8880785dc3d40e8a6a079d0905a3a609d1b99c624a17526
 EBUILD neovim-python-client-0.1.9.ebuild 674 BLAKE2B 24246f34b51ef8eab9d1c55a6902f4f2e7d56e345117a9211d97c6af35e9c38f9eb503ee77747f5095215e8e07ba66366fe378f34e82acaf89eb3fb151e7357a SHA512 77c3f9e42e9f45ebdb3d9341e3305bd86366ccdd7451c416095920d973743e68b3d0ec8d5ea80c2553e2685ce4e622eca637f841373c47ccab5a74c8ad649b5e
+EBUILD neovim-python-client-0.2.0.ebuild 664 BLAKE2B c504d9fad2292855dd4ce10bb8432a90d87484a749c754af539371da60d86fcaa2c509b6757f8688bc1cc894b6ec9ace72c4d8247f130937144b380572d37cf0 SHA512 ae889e4577b14ad4d7664f319763847071705f6b938669678ec63568a9e27074127a3d3b0a79463987e502092d3015d18a7fe35c6ce723b2ccf54464ed079760
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
index 72d1f13ef3f1..ba9be5d3944b 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
new file mode 100644
index 000000000000..66a5585d620d
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+
+RDEPEND="
+	${DEPEND}
+	app-editors/neovim"
+
+S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
new file mode 100644
index 000000000000..6f9f53fb7f8d
--- /dev/null
+++ b/dev-python/neovim-remote/Manifest
@@ -0,0 +1,4 @@
+DIST neovim-remote-1.8.6.tar.gz 434012 BLAKE2B 1fddb5e4376d3d17c2ff0c00e5f98700ab2d221af1ed1bc3f9c6dabe9cf1bdafe9f85041cb3a01f9a45f03df2d76bc0ae3c5a93603caa9ad461eb5ae50cb832f SHA512 b973b8c495a3a371b9a21ec4110beebbfe304f00d73aaf1da849df612e6ea9a08258379600ccb8d83154b8ef12e26088ba90a1668c5262b7dc9c62c844f42798
+EBUILD neovim-remote-1.8.6.ebuild 667 BLAKE2B 8d5583fd913fff3f0883abc5c5b77fd1061bb4bcc60dd305f4053759b3ca1bdaee7b93c773d6a3d62970e19e1fc3276457918816796c2c58e5b1d1d9aec1d560 SHA512 c8aa7bf991906b7a61cf0b5b307289232974d9053d01cd25c6298c8a77c8de286b9d7a141977893301147a16dd402a082effac472144d4ba320db584abf151d2
+EBUILD neovim-remote-9999.ebuild 667 BLAKE2B 8d5583fd913fff3f0883abc5c5b77fd1061bb4bcc60dd305f4053759b3ca1bdaee7b93c773d6a3d62970e19e1fc3276457918816796c2c58e5b1d1d9aec1d560 SHA512 c8aa7bf991906b7a61cf0b5b307289232974d9053d01cd25c6298c8a77c8de286b9d7a141977893301147a16dd402a082effac472144d4ba320db584abf151d2
+MISC metadata.xml 362 BLAKE2B ccffe6e6b67304e57324196888c88050b8214c087edd9e3d63190d4b8e330de28cf6e1933c881ba9036e2c84d6cf58cc034f4a64055118ac075e7d160d0e7ba6 SHA512 e74ae96798c9ff4d0808eea25abfe55e9a086f194f973b27c14abdb17ae144145d561440fcab4a4986462fb63e962d1c4a2c18e16911cd520845b4f98080135a
diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
new file mode 100644
index 000000000000..76ed9960fb57
--- /dev/null
+++ b/dev-python/neovim-remote/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>lluixhi@gmail.com</email>
+		<name>Aric Belsito</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
new file mode 100644
index 000000000000..a6aa978b3b88
--- /dev/null
+++ b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A tool that helps control neovim processes"
+HOMEPAGE="https://github.com/mhinz/neovim-remote"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
new file mode 100644
index 000000000000..a6aa978b3b88
--- /dev/null
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A tool that helps control neovim processes"
+HOMEPAGE="https://github.com/mhinz/neovim-remote"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 72d684f10a18..d03a95ebee40 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,8 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
-DIST netifaces-0.10.4.tar.gz 22969 BLAKE2B 61f4088146549b32c9b026e20d932e3b285e81715c825c7fd736770f14db6e09e3b76bdc6f74a196dace0f7afd6e3c3b8a2f8d9d8a103542a5e8f6b8366437f8 SHA512 1b9b92b69e01e4dd9f9304d3812d78d58ec195a657cb47b2e629ccb1311de4a8cd9716825d7b94d4791f7c479c289638780f6f9afa8a6465fb555130da622b24
-DIST netifaces-0.10.5.tar.gz 24879 BLAKE2B ee31248e3d7d4a1f2e81e59bdfbd52bb6116f6fccacb02a1cedc0b97fb6604130a85583743d7d3752d00a7fa08e86b2821badb7d6b4807c4177c85d0f1c693a3 SHA512 736bb985b444e78676dc10533a7597e750cadf41033196c4be49c4f33e91d46eba33a1f485e07e9f70aec2170c958564a6f54bbaa1ab193bfaca04b1fb07b3a1
 DIST netifaces-0.10.6.tar.gz 25166 BLAKE2B ada66ee2c0a20570d97a9375ce6212c9e7a8765d338b70aceb768912a340dadbf93311aa5cc5a23dd3953f98787be41457c60ffd0f8726cfd4955545709019e1 SHA512 2c892062286007a8330c2cddc148ea21d1fd24aec32b5f25b8fe905933c651f8c532596f523f0bb7edb3a143e9a491ec49d60f75efad4407273ac2647b579b1e
-EBUILD netifaces-0.10.4.ebuild 633 BLAKE2B 0f8c215d7c02bf1ab856f3c24a94726f4e53a8bda42e37dcade7a812032929f8557629ebb3fe80b4a66816e5e76324889abd64dff3df5b9d8056578c15cd0380 SHA512 b4d95ae03e2f8f0bf377babff1789609ef99c5b8dbad5f92bbf8061f4557387deb98b2a3ad21b643df6632901b1ebeeb86eeee989d5009f651f3e5219bf34ed7
-EBUILD netifaces-0.10.5.ebuild 641 BLAKE2B 4ce6ad69937d00e8951f4589edc2fc1508c61f5b75f40ce7cbb21947c218b618a9189b6cf8c1ee1c71bb338291a50599808536c6f3074371871e2425890c2084 SHA512 de12e7992663862eb8d5289e2ecef270e12004bf5ef64f110c5852bee3b48a7dfb75a18e49ddd4d60ef90912fd5300ba695ee46e2be74040ae9a2d263af5679c
 EBUILD netifaces-0.10.6.ebuild 641 BLAKE2B 6e3deef0070893e5d416069ec204b6c69942d1e33e6fa7d5436fa829fdc27dce1a253e20941d592d6790060a2250db4d6b085790da12bc3c3e6a16af4d96f233 SHA512 7d64b1307a613293a962a7438b456fbd3bbfd2fd4e338cc7e21ac220426c189bde64710b3fef7d8a8a8d08009a1e2ac169aef2792ddbdfe04bf2ce131af6d6a8
 MISC metadata.xml 495 BLAKE2B 75476318ae214d37c760fe93ac092f830c2ab1141f06508e1794be65e1d9731c4e23337507f1a29e1b84e87396f797d58a864c9e8bfdb9635004d92d743020cf SHA512 6a1388bdf9efd868c781dd76b855b14a88b010c4d2d95f98e2ea6d88aff34259f314e23a2130de4675e470d3b5bebf46e4f68bdc2152a8e62fa17e48cad95225
diff --git a/dev-python/netifaces/netifaces-0.10.4.ebuild b/dev-python/netifaces/netifaces-0.10.4.ebuild
deleted file mode 100644
index 1a2e405d9cf0..000000000000
--- a/dev-python/netifaces/netifaces-0.10.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{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.python.org/pypi/netifaces/
-	http://alastairs-place.net/netifaces/
-	https://bitbucket.org/al45tair/netifaces"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.10.5.ebuild b/dev-python/netifaces/netifaces-0.10.5.ebuild
deleted file mode 100644
index dc74ba238899..000000000000
--- a/dev-python/netifaces/netifaces-0.10.5.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{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.python.org/pypi/netifaces/
-	http://alastairs-place.net/netifaces/
-	https://bitbucket.org/al45tair/netifaces"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 3911af952d25..bd0ae6cbaa4b 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,6 +1,4 @@
 AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
-DIST networkx-1.10.tar.gz 1189291 BLAKE2B 784dde9b5a0c1a1ee8f88aa00b6c89679df8d078d7706d28b5a1d0633144dd9866345a6f1818660d8ca343b4a3ab6597bc18f8881868763c79346cd8d95fd9c0 SHA512 fc0a0b929991baef63c30382c2045d551b217140393a4264b18a5f1be198d325eee9f57e02dda38a7ad9f99771c5b78f82c673a88b04df122b9d91852db09efd
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-EBUILD networkx-1.10-r1.ebuild 2031 BLAKE2B 6629115c3f3bc5c0d7ff3204390258565ce8d51a5bcfd2304bd1aedd0c5ff1df8118745be01bfc743f7cd361c2947cfca2ae94485bc71c783deb3d99c274d132 SHA512 7322a968d07950d8455c3cae9d3011ef38e92c6aa280609aeaa4814679d297d5b8acbcb68b1d58b682fa1693bbccb49c4cfc68b2cb11cf2dd50383949f37738d
 EBUILD networkx-1.11.ebuild 1912 BLAKE2B ec8ab770f6d9a19e0196a59e5fc0081333766e3db81d004a0bf9f9378e962a986d33e44170b9b1a51e52e7723c9411e1355ce68e7a6322f7cd058f61e62e4f88 SHA512 c88bdf91975f6e192eb557d1b492ba92f768e191aadfd36f1dda73ef5f420fbe9dfe91c07c0c187134a6019cfe364031670068aaac182de6f9b60e2245715a63
 MISC metadata.xml 1062 BLAKE2B 03559c285540641325a657e55b75d147085ed64c92a9f65709ac0158e662a28468892d6af1b17b286f1f2e51251f2a3462e8eacf3fd05a6b0dc3479d41ac2a06 SHA512 1db48def6b8009291d6d5235323b88f42b865e009a6cb8d9b09c6519f9a55ce71ee61904c95558ad719e35161daa15fc253f0fdad2942a6ba1ac44000ab80a30
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
deleted file mode 100644
index 4e2807d4e82f..000000000000
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ /dev/null
@@ -1,78 +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
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-COMMON_DEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
-	)
-	test? (
-		${COMMON_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' python2_7)
-	)"
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	examples? (
-		${COMMON_DEPEND}
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Avoid d'loading of file objects.inv from 2 sites of python docs
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/networkx/networkx/issues/1263
-	if use doc; then
-		sed \
-			-e "s:^\t\./:\t${PYTHON} :g" \
-			-i doc/Makefile || die
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	# Oh my.
-	rm -r "${ED}"usr/share/doc/${P} || die
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index ed9491372696..b17c30139866 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,7 +1,5 @@
 DIST Nevow-0.11.1.tar.gz 563061 BLAKE2B 7763816e44a9b388edd0a77ad3e814514ff2ed2d28c156885bc6517860e17347a946c7b890c4d0688c4c08f60d76832403a772b4754d527c575aa4d8b4f7f3ed SHA512 a7e52fbf6915498e77a41fb100d4c688fcd0567deb56ec946adf1b1712bcfbec7b7a55c551e414606218146772d5274973af7851a78878635e900a4df5193a53
-DIST Nevow-0.14.2.tar.gz 528266 BLAKE2B 6ab749835a8c90ac828f841610f9e8eb799b7a5f29b14c6b275f5e531621f97bb22f7032a3f8a10756bc0c59c8ec04a9b26f71f216682f1f83f95f8154c7ba04 SHA512 6b21e4471fbbe76bf2a64975ed2a04413d059d9a50ca89247d48db9436a9a5e747aa373921310f4a53120466d8033377f85cbea3af14a50b1297d85391d6474a
 DIST Nevow-0.14.3.tar.gz 548818 BLAKE2B 64b5bd46511a4c6c10bdd4335d1e2789e7dfe22e4e4bb014c03fd4949eb701f7f79095e8a239a974d89f0831399766e1b0fad0011f102c70af375d9460a7b63a SHA512 5488be9c771dc9d9b348ee705f8cb1f47400b4789ea574f5ed68c54ecb33e6cc2928d45193137921727f560256e16716adff66ca5179d2a79eb395e0d61c2f05
 EBUILD nevow-0.11.1.ebuild 1020 BLAKE2B 6aca38b377c44dd52f716733716eb8f43cf570b4fb3cd300c4cce3b7d8d68fc82323122eef48b2fa7e42816ea809faa56594ff13c3e56c72ab60caa9dbf59ccf SHA512 f075df2c1af254c7a02c694cd718024c12e59acbd050155ec01daf58bc85fdac14790958692af54c9455733cd3d753719da014c13079777d0d172233d0616f36
-EBUILD nevow-0.14.2.ebuild 1265 BLAKE2B f85895f5c39cdf2f7f46e7f4a8266be2b627fce4f99317de6add32fe10ddb3a478cc08d1798188b3b5f58eb6be507ef0a2f10da5bfe0f94ebe60927a7fa52d35 SHA512 457931f697e41171cd8a1ba7cddd6e9e53ee70bba0040d38e3ccf1c8f6bc5e99e96d1422575779637c6e5f655172ad4ff87d0a96660ea84dccd5de3e6fca2130
 EBUILD nevow-0.14.3.ebuild 1265 BLAKE2B f85895f5c39cdf2f7f46e7f4a8266be2b627fce4f99317de6add32fe10ddb3a478cc08d1798188b3b5f58eb6be507ef0a2f10da5bfe0f94ebe60927a7fa52d35 SHA512 457931f697e41171cd8a1ba7cddd6e9e53ee70bba0040d38e3ccf1c8f6bc5e99e96d1422575779637c6e5f655172ad4ff87d0a96660ea84dccd5de3e6fca2130
 MISC metadata.xml 308 BLAKE2B b7948b5e8794cdbcc882fcec0ec0c4d754e44232dd1cb65932a8d92193b16751bcde6c0cc4ea6f79f93083d948b9b64dfa8ea116d085cc87f121cfb9a2c1160f SHA512 f6315f9350d7d43c1c2df8665f38e6373a1b24ff9950001472333ed45aceb10fd7dcf376492643e6af0a995f561f3fa171341303a4935bd55d97ce2fd6db9229
diff --git a/dev-python/nevow/nevow-0.14.2.ebuild b/dev-python/nevow/nevow-0.14.2.ebuild
deleted file mode 100644
index a2cf9c4418b1..000000000000
--- a/dev-python/nevow/nevow-0.14.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="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		(
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/twisted-web[${PYTHON_USEDEP}]
-		)
-	)
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-# JS tests require a JavaScript interpreter ('smjs' or 'js' in PATH)
-# and the subunit library
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/spidermonkey
-		dev-python/subunit[${PYTHON_USEDEP}]
-	)"
-
-TWISTED_PLUGINS=( nevow.plugins )
-
-python_test() {
-	trial formless nevow || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# TODO: prevent installing it
-	rm -r "${D}"/usr/doc || die
-}
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index fe1ce1d95b4e..7621a09acbe2 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,9 +1,5 @@
-DIST nltk-3.0.3.tar.gz 1011266 BLAKE2B a53f2e628a49c8aa9fbacab9d651a899b1a7d54fa0f393426f07244e013af525f550112351fe42e6e4fcaf59e2a313d1055b62c0190c362d580c72fbb9bb6313 SHA512 b058642670166bff538e2c1c417ffb2e57a217a9f3a056475ad47ffa222df7237bfb4ac00a58952dc6f79f12a32e3a40bf53a96262a4b3caced64c2c09abdfc3
-DIST nltk-3.2.2.tar.gz 1153499 BLAKE2B 1bc7d95e8afdfe30cff1b8bab47cef9f3ef4212adffe066de26028efa423a2c4e1aa96f35c135f8a71070c54f8a61a1d9665f791be474a6f2be27302d2bf1aad SHA512 7a9aba4db26bc091bcba248156f74353a55cae0301ff3d675e55615967a0a1163d2d1db4e4bc51a953ced3c28d0b330a7949f4f9ec3621df300dcad23877a556
 DIST nltk-3.2.3.tar.gz 1166282 BLAKE2B 803dc1a8ec80a17538c2164d5ee0eca201be2307bbf3e08093a55cee93e9a539d8b48ea42c8ad84b540922355bf0b151ae04338d8505378a89173159d7464b76 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8
 DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
-EBUILD nltk-3.0.3.ebuild 566 BLAKE2B 26046642913e00872f5e03341a7a347b1d2f971804c2ed5cf28131620e7be7400725b8ca736a9d08b4d158da7c42006827aae8055fe5f025e13e464a69e6501d SHA512 4cd4525a2872a7007d7f2bae43937db84ac3b95dc323155f40b5babab2b1e1edce999fcdd8aa83f4a215eb552a5a492eb5a73103c2ebbb52ee1f16d556a4a12e
-EBUILD nltk-3.2.2.ebuild 546 BLAKE2B 6617a90580c0ad8532486bb985d5563d0fe679fcb2b71482c1211940ec972b9c5813fd8fce8cdcf3a76816151b8f0cacedf38350d4bec99b2f7b177bb8e77850 SHA512 78fdbf8e7360cb3ab29f2cf20337fbc5c06c06b4b8ea538a57283f72c2229dd2014387662e30f5e3b32021da68de1f3b7363a2b2f3a4531864071a542314f433
 EBUILD nltk-3.2.3.ebuild 828 BLAKE2B 744fda1f9c31b67668244d273fb45f3e65545150ebe2eb258025c8a41e5746cfc6022f5181342a089a8bce72cc1e15b6a3b04c45483a8781bb3e0454c67d1cc2 SHA512 1f12ec98511728139858cb1c8a5519630ae85e070178cb756751a87711d0843ee91ce9551509a9812072b06125adc17a694fb8cf456f936d0173ff4e1ceeef8c
 EBUILD nltk-3.2.5.ebuild 830 BLAKE2B 592fb72c60a801700fc4a1710caca9ecaf6e3b5c70ba9e71935aff06507f43cfe15c71c4855122357524d04fe389db0457459819864c4b83a0ef6188e1a0fba7 SHA512 c25333641e987f8df21265efc97f50d0d7c6abb350352be31fb72339994cb0d0e68040d1b6ba856f54dad2888b44a71a63956b0c89b2e475cc998f128611f55e
 MISC metadata.xml 710 BLAKE2B b5a83ce6dd9263ba32208fea0089ebc7d229c3cecbe0a4094ad0e087c24a3abc6e9f964e6f4469b5ea73e1a618da8c37cb698f93a475cd98b8d62c8d022e59aa SHA512 88962aa0835b0740f96350e417689bbefdef8657b73eb7282e6aaf58fb59229c7cabe39275c66de5cf16665ce0d0572eaac34b234838ad91f69300eb11b996e2
diff --git a/dev-python/nltk/nltk-3.0.3.ebuild b/dev-python/nltk/nltk-3.0.3.ebuild
deleted file mode 100644
index 57605e0d4fd1..000000000000
--- a/dev-python/nltk/nltk-3.0.3.ebuild
+++ /dev/null
@@ -1,22 +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} )
-PYTHON_REQ_USE="tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://nltk.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="numpy tk"
-
-RDEPEND="${RDEPEND}
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/nltk/nltk-3.2.2.ebuild b/dev-python/nltk/nltk-3.2.2.ebuild
deleted file mode 100644
index 79fb3644aaee..000000000000
--- a/dev-python/nltk/nltk-3.2.2.ebuild
+++ /dev/null
@@ -1,21 +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} )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://nltk.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="numpy tk"
-
-RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 7084157a71c4..5302c18ffc42 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,5 +1,3 @@
-DIST node-semver-0.1.1.tar.gz 18338 BLAKE2B cfb9c74cb3cf84725de7de5a97766616f0327f7db0f91687f4448fca8d3f47505060f0580bc27bd0c7d53c160ccda29159f07345949d1132a12cff410ab08fcf SHA512 f652a69330907722d1e6449f237ae6c006a11c48f49b450d390700704309672573add77c103fc53d052014e751949348b344b001acf85ae6668e504811a1d198
 DIST node-semver-0.2.0.tar.gz 10236 BLAKE2B f4f48761a0086b8a2e79307427b4dc93954362452f653042582024cee593b4b7fefb1a14d3d4ea6832255209b054c9bdb05b02cb101af1e359a1266c472c5149 SHA512 7c636d94a262723c5e50123433c9c7af38424c46711c1b8e001931b242fc9703a084a0426b75e6884104a4adc6104a298355bf3c1604b9cae0ddab7d5f11b430
-EBUILD node-semver-0.1.1.ebuild 880 BLAKE2B 58534768de3192f658d407de4a737b1b949bd8253178b1dc6eeb7564ae8b57bfd2eedc7853f35065727ba0e8fc011cc42941e3ac1b4032bcadf3d1356212146a SHA512 9425c6e058205dc1dfedcea4f11a0aae702f4922a912ad3495eee06e6876484fac327422de4983b41b81b5709d13e437c142c5d4f211d75e37ed5d36af4645a0
 EBUILD node-semver-0.2.0.ebuild 758 BLAKE2B dd1953fbb39a74bf32220e6d8ca33114a0bd0b00eb44fd392f2f9c1df84d2d1ba5266a5fd7d36a78a163ca07245fa01db00b5216c0663adec37bd53a1940253b SHA512 33b4d630820582f2d319f0166caa3b5e2cf2e22d0137100b4e39af96e4d937211c44a2485e8ecd9582cea0c5f818942f6a378febff03f52366c6f04f4c5467e0
 MISC metadata.xml 745 BLAKE2B bafe049cf8ac9f5a735151a2b6ecc4ec60345fb21936017a554523164d5eb7e04a806381f20c257b6507d22201a747887e8a83654abc1387b52de17477b0d975 SHA512 615429b43049be7deaf2334ff5c1cd73289d42569ccbf0dcfc3dc3cb5851b2f5b162c9a0f5c5466a9b2623eff311ff733e1edb322f9a818bf169f05b59fbd48f
diff --git a/dev-python/node-semver/node-semver-0.1.1.ebuild b/dev-python/node-semver/node-semver-0.1.1.ebuild
deleted file mode 100644
index 6285b77acb50..000000000000
--- a/dev-python/node-semver/node-semver-0.1.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,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
-HOMEPAGE="
-	https://pypi.python.org/pypi/node-semver
-	https://github.com/podhmo/python-semver
-	https://github.com/npm/node-semver"
-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-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# https://github.com/podhmo/python-semver/issues/4
-	sed -i -e "/github.com/d" semver/tests/test_negative_range.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index f9457281687a..c27f450697f9 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,8 +1,6 @@
 AUX numba-0.19.2-docbuild.patch 601 BLAKE2B 9fa515f92346f732501dd3c01eeda331a456e06fe0a2803ea1de892c0438d898b9ede8eec9a0edc6673d5a6ab9170d54baa0be1785c1b91d87b2974f54ef9b85 SHA512 86c0ea1f45436c4ff89bed5c00da5ff9be92aa7bf445e37165d174f7e36a0809c48d0f7db665e3c171748822e7f70cdb8dd6cd0396b5f98587fc426de455f033
 DIST numba-0.27.0.tar.gz 1247144 BLAKE2B 42de6e0f7865efb597ed1dd3680eafc66906d5d9cc7a8b583847cdd12a936174af976933de5aa02859c2025b86f51da3d0148f89ecd35287caadd8da8fa8bb53 SHA512 3c84fa58bc5e84683b5e593b99f8c48cfc6e9fd0f41a2a18d8a4d9deba618cec1e764a0202bb71166cbeebf27b908044be29e3b183b01f31edc8e85c962df876
-DIST numba-0.34.0.tar.gz 1603388 BLAKE2B 14d1647502e945dd86e61f9ba6725bc89c8321df3588e7d9f42eead39404f8b3dd1e04295f26c9d829c4872876a50130b9973d714cfecf4ae067cee8e8c6a415 SHA512 270bc9b2ea86e96285bd4075a216a31c3654b782e5e7fb26824ed0e57283a48f753542dab54995c14c0c7c303d8794659a1155eba1deb121c670fc4edde0f3aa
 DIST numba-0.35.0.tar.gz 1647189 BLAKE2B f0dfd6fe03e1a60b4d19f0f4d1b158d418686376f4317b7f4b5fa0734b35b6ce670661705f92994910a8b47bbd0689dca652f36cea1a2f9d5afa419ae1c8b5fd SHA512 48ee1e33e7ec1327a78c3485602e911f045df8b8dbb69da3004133e6da8cbb52388712b4aeffa1e41b83d20aaa88cc8c1202ef35aabbf3e0e04ad2875df789f0
 EBUILD numba-0.27.0.ebuild 1758 BLAKE2B dedae675dd323f345152bd8e53d14fb6b363cf8dc521de604c55467a1a76f19a89616d44fd4bfc25d5a87eb312a5cfda1c1df7e48d9f09490d213a91606755b6 SHA512 b0a95ebb91248e955d360be197ba967317b06be161bdbf01b4087095d7bd3135cb3fd3a41d947f9117167adf2a75c6e9cd11a2c5aa9b5643f01d9ce89959e5c8
-EBUILD numba-0.34.0.ebuild 1067 BLAKE2B d34869828ef23b0542cba26055d91bba8f9f9b7452b87afcbfea869585ec9d4b033ff126d63870d5c679f955f6575146cf00d1173c2dfdde9036ab4ca59400f8 SHA512 7a7dd64c87efd361f51529ac7d361fbd7eb8959764dd66ed9ccbd5296921d04b08a32adf5bd203aa4005c9cca9e0fbd87f2438e972daa8bf1596fb030e8bf196
 EBUILD numba-0.35.0.ebuild 1067 BLAKE2B d34869828ef23b0542cba26055d91bba8f9f9b7452b87afcbfea869585ec9d4b033ff126d63870d5c679f955f6575146cf00d1173c2dfdde9036ab4ca59400f8 SHA512 7a7dd64c87efd361f51529ac7d361fbd7eb8959764dd66ed9ccbd5296921d04b08a32adf5bd203aa4005c9cca9e0fbd87f2438e972daa8bf1596fb030e8bf196
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/numba-0.34.0.ebuild b/dev-python/numba/numba-0.34.0.ebuild
deleted file mode 100644
index 40122f0ca614..000000000000
--- a/dev-python/numba/numba-0.34.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,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.19[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${PYTHON} -c "import numba; numba.test()" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6282c9d62dad..9e23ba9ffc72 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,32 +1,24 @@
 AUX numpy-1.10.2-no-hardcode-blas.patch 3295 BLAKE2B 300b64a2867cb55fef23aff58069187c1c743740fff75442f56da9e817adc4a857a29dccf5c543ff4c63da5d5618a34fdc1f640b65d8f8f23dcaa96c6334baa2 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd
-AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 BLAKE2B ee47f60c4b10af7cc36be22e5d8f58e646c476e0abdeb36a51500b53838ede57b423e79ca79b17d09af706db53b199dd211cfc54b372b63247419f6e9f0e1bf9 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228
 AUX numpy-1.12.1-no-hardcode-blas.patch 3473 BLAKE2B 442b505aa6a09aece4e3e48c43fffcbb35e129f99097233d7387ea41bf3926ed72be4666025d4c4bbac7a5e9e557e54cc0c439d748cbbbff6ca075e7a1969c56 SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3
 AUX numpy-1.9.2-no-hardcode-blas.patch 1821 BLAKE2B bba698b76576a29c24f69a5aaf92173065d11d2e01ae8e76a66650484f18761b62cb49d348e97a62350cf74d9c728f2d26e94b903b62c59c903e7022c31fefc5 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6
 DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246 SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
-DIST numpy-1.12.1.zip 4824784 BLAKE2B 3b5b44f5cdef5f3cf063c7524e8c18ba4c0661f67e74817619685cdb5ee9ae2cd8f31e9ddd8a4e83d014f0371d4caf2ea6d5e3595ab3aba8f4ee4c101c4f3ae4 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a
-DIST numpy-1.13.1.zip 5012881 BLAKE2B 865f5423ff0c20dac531cdeb3adbbba760632aba4f0183f4b44ae93fd6bd12c8bf78abec3fb47969b45f86b72c928330142d8897e201adb7236b2c6f76ba0089 SHA512 bfa97ca4f958b04c158a4bcaa366ec2645c972654bd65fb20c287806f40fb7a04b8cc1f1cefb350d477488a93029d75a9f06d01c300cfb1805dd10819a631c43
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
-DIST numpy-html-1.11.0.zip 9879611 BLAKE2B 01f9fefcb71fe22d694af6a117da19e79c983c0f68f9e81fd060f4cb6dec6d13ba8e2354ed6040da58796a05c5a05dbecc595fbae2d578191ab4bb22f0dace4d SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
-DIST numpy-ref-1.11.0.pdf 5310792 BLAKE2B 068e6fed91fe15dc9a77bcc50b32b8727fb98ead513f50d4938bc5c09b1c5bcd4e9fd9701cd1b9bf38656692d15f1b98b07801f8b73e1782a8e216f7e15773b8 SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-ref-1.9.1.pdf 5318122 BLAKE2B a893be075c823ab1a6ad3b2e38e8c05aad20cc2abf9307af9dac87b12f029fe07b535b1f385a4315bcc9590fedb79e25bc5e1659885ad61cf010d2f45ae6edf5 SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba
 DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
-DIST numpy-user-1.11.0.pdf 555403 BLAKE2B c659a0d8d0587396c9bbf8fbe3ebaf5cb7311f46e99f0e0944efc96e9c38dd3c60fef6346ae1662b923c39955e0c662ec1993b0b2904f04888b2b3d0009b044b SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4070 BLAKE2B 67a91881682dfd8e6b80c5c18b1e53c25bf742907857a755c9f671506601b9d1ba8ce96f62b0582f465cd4f442a34258c25877922e1828e613fd9eb36872a7b9 SHA512 fa27a99853a99fe5568ed5a000c5ef2894792aa6b927b4df20698178603dc187633973a6a72d97d10e04128e5722f5665efbfa8be56aebceed8a438b9049485e
-EBUILD numpy-1.12.1.ebuild 4611 BLAKE2B 35048fdf92ff976be5809f9c6000f0513116e11449828d16767a50fed354e4e49ffe7b475b898fe97b93408a413c081169feab0c5c9bd232376f799c1a6b0c19 SHA512 13ce9b1985f951c8a658b5f43d1abb294b2e20182df5c9e60212a93b625d014aeef875de5d1101e46198cfee7bac4b987485b642f8c152f79989168b5fbe36ec
-EBUILD numpy-1.13.1.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02
 EBUILD numpy-1.13.3.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02
 EBUILD numpy-1.8.2.ebuild 3958 BLAKE2B c2adc30c2fff21de615af9341824e59e46d0a5b5d5e0d725e2b37ad50cdc98c32e5a9efb00e7c77194a9386ace2389453cd963ab954b87f8ad481f20e645f2e6 SHA512 c2ca2bbae41ae787a7d7c0bfdea213a217a67be2cc0c4f8e399ea9c81f0b777563194d733bd350ff0af6c2218c0f1a4f1792e1d77c1472ffdd9eda37e736277b
 EBUILD numpy-1.9.2.ebuild 3971 BLAKE2B 1f26245296aa824966a93ff8f2881a0a4d6559745d8e39bbcbbf1ba94997193bf9c3b57cfe1d752e7ff1973beed34fab482818445c107e9bfb645ac09d95b0e9 SHA512 b8228e945ed92b73041a676c412e66566333274612dec1f33ecbeb9b5a7ccba377c906fe429fdb760ceafc25fec6ff6a9b1c93655576af04c5ce3b8baa4010f0
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
deleted file mode 100644
index 9a934cc2a40a..000000000000
--- a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
-Author: Benda Xu <heroxbd@gentoo.org>
-Date:   Wed Feb 15 11:17:05 2017 +0900
-
-    BUG: blas_info should record include_dirs
-    
-      blas specified in site.cfg could have non-standard include dirs.
-      It should be read and saved in distutils/__config__.py
-
-PR: https://github.com/numpy/numpy/pull/8619
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index b8520ac..0fba865 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -1667,6 +1667,8 @@ class blas_info(system_info):
-         info = self.check_libs(lib_dirs, blas_libs, [])
-         if info is None:
-             return
-+        else:
-+            info['include_dirs'] = self.get_include_dirs()
-         if platform.system() == 'Windows':
-             # The check for windows is needed because has_cblas uses the
-             # same compiler that was used to compile Python and msvc is
diff --git a/dev-python/numpy/numpy-1.12.1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
deleted file mode 100644
index 923ecd5f7c46..000000000000
--- a/dev-python/numpy/numpy-1.12.1.ebuild
+++ /dev/null
@@ -1,164 +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}.zip
-	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}"/${P}-no-hardcode-blas.patch
-	"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.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.13.1.ebuild b/dev-python/numpy/numpy-1.13.1.ebuild
deleted file mode 100644
index 3fde5c7bc3dc..000000000000
--- a/dev-python/numpy/numpy-1.13.1.ebuild
+++ /dev/null
@@ -1,165 +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.13.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}.zip
-	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}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.1-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 || 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() {
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_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/oauth2/Manifest b/dev-python/oauth2/Manifest
index 2888e57cdb11..97e31fe588fb 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,5 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
 EBUILD oauth2-1.9.0_p1-r1.ebuild 1016 BLAKE2B 9ccc2105385fa98c9418a9dd58cc4042ad202a431d47bdc340c87a2a24bd9265e5bba56c9cf7df9d9f0e0b195a212f55ed4cea9b708e97a09d5bcabac0a2ee84 SHA512 373d863c78f786d049843ef6ca824bf2f1733f95a9c51700172410295a51f19e9415266ddb0f963047c550eec5fa6ec331c5a9f92053ff447ec54460987631b4
-EBUILD oauth2-1.9.0_p1.ebuild 728 BLAKE2B c4b6450ba513a958506115f679f12ef493aeef3a22e32292ee399d137f837603c551ddb50ae9653e5fc1ae21fa7b72d9c1373f386010de143a95b07c12577a84 SHA512 186f2d908ea528e235562a8fe921e9d4a1440cadb5ddaa31eeda57cb86f066e9ab4b8b94b6b9e79d80f5d80e232ffd72ab0fb5dfa5583c0a4e980a96e117b595
 MISC metadata.xml 371 BLAKE2B 6c43294e3af678e152bc35ab923bca43990db39552673b6dde5206eb5d82199ca46d4162d53fe1f62b09ec15ae9b54b27c5c5c59ca3957ccdb532feaab63147c SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1.ebuild
deleted file mode 100644
index f4dca70da95d..000000000000
--- a/dev-python/oauth2/oauth2-1.9.0_p1.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=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-MY_P="${P/_p/.post}"
-
-DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="https://pypi.python.org/pypi/oauth2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${PV}-exclude-tests.patch" )
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 48f52a8d2961..f84fa292e063 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,11 +1,7 @@
-DIST oauth2client-1.5.2.tar.gz 131665 BLAKE2B dacc72b8cc22a99ec8bad234f13e6f19d8af93142fa3adb5e4b171e9b187bd86a656c3fcac01ffd37cb5b7ca90a00d9aa0b3c5f39256cb085bbe484f84461041 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5
 DIST oauth2client-2.0.1.tar.gz 153127 BLAKE2B f7e7ccbe42effedfb94abe4f78e2ea02867aa75ca7ff794d6db6cdb2e039d4a7d55df79df3a7f8777be215fc4aafb1dda08a23b81eaa66d64c9b2580045c158f SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183
 DIST oauth2client-2.2.0.tar.gz 167484 BLAKE2B 60c7fc941548874f436df094a94e97312983f88af8ca472c998cb7121662363793423d420fa3e7e83032b82a3fd22a76f9331a60e3099785ef82d3fb5a781356 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6
-DIST oauth2client-4.0.0.tar.gz 183288 BLAKE2B 3330cbe01228b1b57a668744ce4310ee23a55c858fd05d0424fe43c16bb7e211e0d9e2c3d8c148db276bd61fcf25db12437dce6093dfa89375caaf2c848ca528 SHA512 b59805702c7acb306801a04a92b7f700c0f58d5937b4b27a497018d313922512b5ec3f1711bacf13bc7e01c4f006eda5344a9055f981ba34e116c34c56c5dfec
 DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda78faa82da5fed75b2a40308049c7d78951d593352f2e02c7bd9255e75b50c20996d12f451c20e1dcf2c32f54008b07 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18
-EBUILD oauth2client-1.5.2.ebuild 920 BLAKE2B 19b658df697c24da05620cf6cd1f024c9355aa6b41f20445b11ecc99f3d42744fabfcd4157562c465958c865cfba7774252e83bc400e8ad6f155236a866a61c3 SHA512 2fd76b033f7853bf91952cd4bb3de1db3f6f91a528de1a2afb6d11f4aaf091d299f3e5e5695765c5c5bce20bab54d8a8deeb7d21a70109583c4e7692011783c2
 EBUILD oauth2client-2.0.1.ebuild 1121 BLAKE2B ad08f30627a7055b827652dbabff7edb21355256be854b7ec340d772f67148b18ce9170b5843ca013c51a33387a41de35c61aa5718692eca750c0a5dfbbfbff9 SHA512 500f6738904d42d44684ac4857c6c45abdd978c94eedf3ba30f1fa17c5b51837bd1a7fe8559cab6b37fed2b03af5e4f931af961375445c19cee6a56fa75d2b2f
 EBUILD oauth2client-2.2.0.ebuild 1124 BLAKE2B eda055c529bbbc5b648a20a6039f25cdbf324780a6a64f98cda1f7f52ff1e1ade128859c2d59621382f7231b711891e9b71fbf29c09c418c087f21fa6704ec6e SHA512 43601344ec3fa8e34652162c983408aefda4b62c0c3c96fab3478005adba4c8628fbdbfc1fdff068572684103a9fee1a32147be9ef0815320121b3816aa8f4b1
-EBUILD oauth2client-4.0.0.ebuild 1130 BLAKE2B 6c9e403b491d6cf302a71adfe5a1e82d548f92ab94069154983666b98ef2cb6c73cfb13f9acbe5292ec37f3115f553b3ef958704de68a0a2170b4463eb76aa6b SHA512 d64b9cfbfea612c3963c9f2a650156861ae992761a313c6cbf568dd815a74dc2006eb0929acc1cb064e45b92d99558e6061916f2c3ddc9ef6984342b80e30d6d
 EBUILD oauth2client-4.1.2.ebuild 1703 BLAKE2B eebbc951e573a3c4b232144827f2afc4fffdd8caef2dadbc808a95cddd9acf47a4b16eb7cb84f51ca00cdd366517b7e1feaf0bf349a3e10b866ab435e339a5cf SHA512 1807ee810a4e1f89ac458ac3d3e13cbd0c7d1ff814c44a708355cb67b219e2816feeec985fda6038536af6363bee18eed8569d02318de6c75e4500211d5d3b66
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-1.5.2.ebuild b/dev-python/oauth2client/oauth2client-1.5.2.ebuild
deleted file mode 100644
index a67b0ceca523..000000000000
--- a/dev-python/oauth2client/oauth2client-1.5.2.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)
-
-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}.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}] )
-"
-
-# Needs network
-RESTRICT=test
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/oauth2client/oauth2client-4.0.0.ebuild b/dev-python/oauth2client/oauth2client-4.0.0.ebuild
deleted file mode 100644
index 9c0d1405c17b..000000000000
--- a/dev-python/oauth2client/oauth2client-4.0.0.ebuild
+++ /dev/null
@@ -1,45 +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="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 ~arm64 ~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/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 8ccf369d2155..22a903b55e14 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,9 +1,7 @@
 DIST oauthlib-1.0.3.tar.gz 109095 BLAKE2B a95915eec5bc5aa8ad8800c06ad2c05ec0e362c186647fed0da8036e763c04860120da6c2646562894b376b24a9895c05aac1cdf189f457101dfe40b74e5dde4 SHA512 b5df82729edc025f262a18c012f6036f52e97a8a846eeb75e4e205928acfd6e971a58194c4a06853d6743329d397e69b94fb431047b2a17a2cb2472c889c4d4c
-DIST oauthlib-2.0.1.tar.gz 122966 BLAKE2B 965dc2db41d1486c693774bc4668b2b2e9387890a18a6313edaa6fe90e9d73eb24eeebace0fd7fff83ee646b932c11bbc66b996415635efca37a1bec211cc49d SHA512 5d19839d1fec6939d10a26b5a0cf96024783fbf67b91299ad7ad640c5c75170918fcda9ed0e13333a5dde353b86201f033e410b8312f1d9eaaf9af0b289c348f
 DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e716ddcdb789560be5e29fc32071318a523bcb60e0d24ad93c407971b561b260dfd4ce0ec5b8cc915a24f53b0bc5 SHA512 ff2a720faf8a649b1e29f34fd4b5b0838937cc1ebef3fa4828aeccb781097d02b9578717de48ddee49e43c86840e38147664a87b81601616792765541cbf18e4
 DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
 EBUILD oauthlib-1.0.3.ebuild 1036 BLAKE2B f0eeff3327bdb91898f3cc58c795eab1dcc722a22cf1540f078652da64dbfb86c94064ec1decc062c258e8ab1ab3d1e71676a8a38b214df7f2b0d421edfa2878 SHA512 143732f61737e44b5f1e35847cb64c3e16e190a466ec952697b95f7231157df0356eea7b734ac6e2cf5c250d8834009b53bbd1518c63ec8194ee34cf9fac1e2e
-EBUILD oauthlib-2.0.1.ebuild 997 BLAKE2B 76290de7d96e3baa7dd27e1c8ea7671d97abe57d3d2463c9f17d1cfa1c8a8e3e5f18c64b6337bff5a49ef29b9c57cb16a5c4a09904efa3ee7a597416185f1dd7 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726
 EBUILD oauthlib-2.0.2.ebuild 997 BLAKE2B 76290de7d96e3baa7dd27e1c8ea7671d97abe57d3d2463c9f17d1cfa1c8a8e3e5f18c64b6337bff5a49ef29b9c57cb16a5c4a09904efa3ee7a597416185f1dd7 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726
 EBUILD oauthlib-2.0.3.ebuild 1002 BLAKE2B bd98cf786a007a421dc4c52b4cf95b4a98a25ebf3a4733e63609406a2dfcddb8ce44145b25a87838821134971d4d17bf501404e084ed390211732ef0cbbfa24a SHA512 240a5187a0a24a9f4513caa8c55030b32967dc30e3ac2ec28afcf58eca385a921eba43e6807f72f6302427d2ee5c5b0ae40b97376ee27ae6383f02b187cb2593
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-2.0.1.ebuild b/dev-python/oauthlib/oauthlib-2.0.1.ebuild
deleted file mode 100644
index 8e2670c4e15a..000000000000
--- a/dev-python/oauthlib/oauthlib-2.0.1.ebuild
+++ /dev/null
@@ -1,35 +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,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
-	"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 077d96b9baf3..5068c0943db9 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-3.18.1.tar.gz 47274 BLAKE2B 8b9c02bd943623a8edf3cc0e5a28a429238487f89ece006df3ff6590a30d3013966635e3441c9056c03b0abaa135c455ed01c26e5cc9bf9a9386e373ad4f846d SHA512 bb8eb61fea5995313fb2844fcf3c80ce15cebeb266ea50530569c33d404e75958b7e51a0d11b3cae67d0ccb2738fa8789a902fbcd8d7911283305ac4d4930476
 DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
-EBUILD oslo-concurrency-3.18.1.ebuild 1659 BLAKE2B 25f8337614f441df78cb7eff8197c5ed0a6dee368b74c6b897b2bc01ae8aaa0fb0fd8233649d75f20a744256fe2e001bb9c3d190a1abbbc61509b504d4fd2ada SHA512 7d11bc83a78a4ebf7c2f2c99a53a3305f3d258f17afcf85fbe4e2e11abd227c9bca0a3cb009eb8665cf38840b7107a43af2ee1388126717717d0533e6d0da05a
 EBUILD oslo-concurrency-3.21.1.ebuild 1952 BLAKE2B a9ff0a2a4c8dc730335ff225bed5221e7f17dd824234f19b10a49598edea40a2a0f75e954d4338f24fc7848e7d40f2f7d0be41968cb4707ae094aaaa6b996d3e SHA512 f5ed1e768fa298959da1c2d46db9d919ae0d52f09e1b1181dc1969136213a6b7d3a450ac04363ea837801c8e1b2bdccecf901a3927796bc7a32802d7086acfd3
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.ebuild
deleted file mode 100644
index 7e3dda1e031e..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.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 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index d8d8b8e8819b..d254b5f0ebd4 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-3.22.1.tar.gz 117975 BLAKE2B 1b43a6c5fa154165c6f61620ff6f2d83700dcbf9f682b43d9f1b7be426ce606f23ac6b3cc7c76befbf242810634d9b9524470651c93df5c56c8b131e87f4866e SHA512 af84f132d33b1fc4a63f4006231bfe09bd2a1ed0236e14e79d6013d7c697814a23f9318666186a6916c00f0157c2df227ed07fd874a65129e0cc686a90e82704
 DIST oslo-config-4.11.1.tar.gz 130922 BLAKE2B ab3f142c54a09a3f512614452966f61032ae4f1a0163ac4ffd1aba13b4e2d0c52f597c401a7a0894276aa7a05879a4bfdc1d0a5f0f8fafc6e61b2770d34a6d7d SHA512 c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be
-EBUILD oslo-config-3.22.1.ebuild 2142 BLAKE2B a7fb01e6150e1fd4a76d0a01ebcb2b7c30b73b961f0b606015c22a7aa742cd761e3d860d448942f6c24b9db689f211656552704793c5e4657ad5768f9e7bb92e SHA512 f43cf405165075711ad0aa29c25fa00180b8b9285f38081f1c0840b2dfce7a892cd8c93f1266518f6a0c74eb798ec4ade8213787cc39967adf1c89896d627704
 EBUILD oslo-config-4.11.1.ebuild 2287 BLAKE2B 8195369bfe88ba2c33840cd6ac9e744d6f31bcb84048bb054d61d3928979c725ff02352023e3d103506bcb8055c15dbf00e09dde4a3adfc7e6d951dce2285117 SHA512 82404fe61a991735ba3601725986bad53a66efe4fe04abc2b357cecaf48d04e5368dcf45556b231d0ff2244710d7fdac35dd226f24ef33162083101270f31aca
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-3.22.1.ebuild b/dev-python/oslo-config/oslo-config-3.22.1.ebuild
deleted file mode 100644
index f664eb86e465..000000000000
--- a/dev-python/oslo-config/oslo-config-3.22.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=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index a439de1d159f..92baa8879582 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.context-2.12.2.tar.gz 26860 BLAKE2B cdf6e6b36fc625b183745a2030b9acb827cb43c4032f98637314655082ee65a0182d801ded3f6d1d4b1f9b3bec789d4ae3f382c7f9aaf1d4f788bf8286335384 SHA512 752d2e9744fbf94d23d6cc3205f3b4974d440bf71ab885de2feea3e706ed93b771b50df264c754cc8f6882f8526de0318cb3d1fc07a28a872f4b02e59118af98
 DIST oslo.context-2.17.1.tar.gz 27266 BLAKE2B 6d539af2d191103a411db0a7671d0ea4a9bb21d0a33e4e306ceac8455c4b0aafe594541b3cf7e565372dee66c3a7c6685b86c96256046e108ee21f74633d01a5 SHA512 f75d9cececaa095cab3b87b05ab0c4bf9f115b96ab7feb5607edd00a33440a4418692f4f6cf8a3dffbbc302758e734c4184f271e3860e65d9da95f0a97ae633f
-EBUILD oslo-context-2.12.2.ebuild 1308 BLAKE2B 9806126452323c5cd38e03feba7cf13423043c2ae40656a6296b11e9e0cd55baf39c2cda95e29b01d360c61693057a4c412f31ed2c5080a5b256676b47b6c8fc SHA512 8e8b630dd2499bc561371eee807d6ea24070758d86200150ac205ca9c6a57064a81e90881045018eedd29d5d2fb8368f824fe4c41ccd517406480b1373ad90c2
 EBUILD oslo-context-2.17.1.ebuild 1407 BLAKE2B e506841756253ffc5bf45fcc1830f216a88a66cf8a13894da49acb5ab75f11ca727a11d9f3dcd0e0fa867bbc98ffd29a1b606a49fe399861c6384656b437f076 SHA512 c156fc6f1d63f2459a321313812d596d5adceca14a83b0cd0fdeb53d3e8b240d17d0f1da6b129bad2852be00506c9b90e1bd80d8a7c6216ed5f2f192f9d80b9b
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.12.2.ebuild b/dev-python/oslo-context/oslo-context-2.12.2.ebuild
deleted file mode 100644
index adbcca66fe82..000000000000
--- a/dev-python/oslo-context/oslo-context-2.12.2.ebuild
+++ /dev/null
@@ -1,47 +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,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.context-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# This time half the doc files are missing; Do you want them?
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 5621635ea3b6..eb5591664ff0 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-3.20.1.tar.gz 69615 BLAKE2B 60c8c37274d71ff80e80e406eadaf7b9d9ca3d0faf16ca51b196440e444410fce36d8f98a2d57e80b73167d77b6a6c0fdc986fe2bd3c88808ea1b856508a9ac5 SHA512 9f802251177a8a822f5944729ac226e226cf7dbe94b9d5b4e5eedb7c64f6968a35810cc288b774085f16f77eaffabf752636bc51c52d50e87cc2840b76076f13
 DIST oslo.log-3.30.1.tar.gz 78884 BLAKE2B d45e6d2e02877f9d913e449d8f4cd08e271712e96faf1d47ea534319f3af073e122d2910977b8cfe28f683786bf645beb335fc6d5d0400058e11a8a31941a769 SHA512 0a53a3228ccb00a58c02577ec391ada064c17999d51fcd3e6471a46d601473c5ab5686cfd61d11ebb33a594dd5845317920fdce3ca48283a39dec28f1a23b795
-EBUILD oslo-log-3.20.1.ebuild 1954 BLAKE2B e20b053aa60a6b28a1c625426421ec0fca33068566acdccc103e90f0dea015422f3547df670770e089a5b56b6974bf5d812b16b3cb82abdfd79f8ab9ec992edc SHA512 0f4ef9b2b23af2273b2d47fc54a77c6eb058c1adbac7f8f231afeba187898d1a34ea29d79dd271932f50e45ae506eac8a039b41a41f38098a11de4c80907f8f1
 EBUILD oslo-log-3.30.1.ebuild 2209 BLAKE2B b5323391e0c490ff5b3e1230a6df69a26f45a9e9caf759ff03a6b8f9ef623b261bde98dc90c0a577a30e9f419999b4403fc3dfebb3080d9b3b6a6f994649cbbb SHA512 50ad442ad63f6a9f10cc9770ab8b4b89486420d21d7f6fdb3370287ad6d33279d676a377a55b6c7e9ea1a9f5b20d7c44ed2201c821caae3ad31b0487921cba5d
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.20.1.ebuild b/dev-python/oslo-log/oslo-log-3.20.1.ebuild
deleted file mode 100644
index fc0db9e7e301..000000000000
--- a/dev-python/oslo-log/oslo-log-3.20.1.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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index b169277fe56d..34d73133b654 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.messaging-5.17.2.tar.gz 306066 BLAKE2B 00b45f6b8557c4221005f99c17c0158f937327e0e866fc7160767b056b1b59c4a7fdfe34411d1cd9b2874b6d86cf9efcbec4f7af9990f0d9cac217c795cdc3bc SHA512 90f60b4813eabf41d03759e12d7a1cbce334169606fac7ab657c3002e01624946cf492d7a1e5984a4d642f64764691da1799eb6ef4e2ce37196651bafc750760
-DIST oslo.messaging-5.17.3.tar.gz 306897 BLAKE2B e1a61dcc6a2533c16529f5e8156998cba8834a1f3c3c1fbfd2b2e218bc2fd407b45096af343015e3a887ddb07a09a2313f0bdd128da354022213f229f9b47a35 SHA512 c5f721499d07bb77914e6c2883ceaca145c94809740274b86b80e6ed83123c12a4ebcea05f287bc651f5d08705100840c973965ff80f5ad976b0fb76c2b026f5
 DIST oslo.messaging-5.30.1.tar.gz 316794 BLAKE2B a962841520b559fb433fff6ac2cfa884419d1d53d8ae1e99572e5b32ba2f45cbce55bc812891ab0cffb65db765793e020cf42308a53ee199027e192fe5aaa880 SHA512 e59a17a76963681cd96ef63a5f946ad2e4126f80a7fbdb0d1bc48597ad889862c72450fe526b46d3712eaf92b489e1c0020096e825654c7554c382282923b526
 DIST oslo.messaging-5.30.2.tar.gz 317883 BLAKE2B 4003de476db2636eae2462cd3aef7bacb911e321c2cb228263482eda7a82361ec4c731872dbaa8394cfdb42759a8c5e200a03b919c0941f74da32498831394b2 SHA512 b4715c73c158414d1b65fd56c6697ff67ce24499e96ca076f8c3d5d93d0b06ca1f9f80fa0de43c5ee0d5e8de221f20b95e077738b026bac6671d1a2ec6128b08
-EBUILD oslo-messaging-5.17.2.ebuild 1996 BLAKE2B c9a4526dcb15238d40b5b34ac8b7ffd9f9a4ea418ed6a328a8bd4435bfb15c0bf908280bfbe87f6bfc55abe19b57193c9b7cb2a0df14b33206156d00a0b6d94f SHA512 c79f75f4cbcf3f0bb065d9a5f7b3ae2ee8371a01e86d4f958e95e86c5a5c9411f8dc1b14158449129352d3d85f434ecb0442e37eafc0a96e5d33abcd417f3adc
-EBUILD oslo-messaging-5.17.3.ebuild 1998 BLAKE2B 00b9303ff1e68d23881a2a50973365e2a41a64560afb3b60673985bfaf6ec7758f8ffeee2dbe8e8d899a5eb87f1e68c51b117582f68c0d8544911f91a24e20a7 SHA512 32e5d49b50c0475fde1f4f3b609f9c5973630e542bf404a2e96a6e4b5ca7a67e9591482446631e1d8a2549a506ef3546c67cbe566a5607218196412f9c9915c9
 EBUILD oslo-messaging-5.30.1.ebuild 2145 BLAKE2B 3c903549b31026bbe3ee6d78e6fc8a651b15b381f3aefeb5d1d706eefef945adad87fab02024e795a7ae32a1c974edf43d1bc6d963acd4bbc6ada41aa16c1c23 SHA512 83b8c7a8adb6ef7e670a55b0d23c7b19cd9bac290bd2387363a61e8f6b357a92703df8c41d1c51432e0ae8f003a67456d9b45e3b59f54f8cd9c83e48337df035
 EBUILD oslo-messaging-5.30.2.ebuild 2147 BLAKE2B b4c24092e8fd62d0e2d1ab65a946454244223135177c2b56a80f4bb3e5b45974a1de4d12e96dfd91bc38113caf2e12dd45718069aa395f3fba0c3cc6675782f0 SHA512 b10f400551d0f03e5f70a957221c6556df34ba080b5dee487c9bf0f7a78d309fb54a556c6ac3feec1640bf7fe27873db8ec5d1f7c6cf12c43a5e774b082186d8
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild
deleted file mode 100644
index af009c4eb33e..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild
+++ /dev/null
@@ -1,54 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.17.3.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.17.3.ebuild
deleted file mode 100644
index 02bace6b7416..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.17.3.ebuild
+++ /dev/null
@@ -1,54 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index 856a7532a6e9..2b6aa2faf512 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.middleware-3.23.2.tar.gz 51645 BLAKE2B 477ae159675c059a363eb598a37b03495739fdddef0a729a8b260a06dc236e3af89643dbeca0dae15b0d5a12a23c89f0e9f4b7445e954cd9b5da5731f529d87e SHA512 0fbf97b3fd5ae69c72f42755cdfdba7dc70570763299cbdbf836b5ad0a70c692cb1249397ed6e6f9d843223f656e5814adcc80e19d283984851216ea7395de83
-DIST oslo.middleware-3.23.3.tar.gz 51949 BLAKE2B 60e63fa02fc8b4b84ba66fce53a12a1f4d4b43d74908e512a0e5e0912716064ca74f2c43067b69a7e9505768c1753a40b72b0e0826ef5d24feabf9f811d6a134 SHA512 f539eb3557399918d069b83b57072cbeec97071e9142d27f21a3fec258885d5a0927722c633d098494a37155600769e1d3832b79c5c8e7526168ea51efe741fc
 DIST oslo.middleware-3.30.1.tar.gz 56811 BLAKE2B e32cfb91a813883b8f50aa72484f679758efe1f1a0faf9fb3df25c77bc3e0c53464bc77fad95482ec002ca013e17d6f20e4318cd46373decb6ce7ce28f933884 SHA512 ec70d1a5e932c8da7bc4febce8be6b63ec8fb581e2b30051ab655a2a98689467d8e824d073cd19c8dd320d02a975ce22845ca5ea73f1c4e3b5ac9f725452a9db
-EBUILD oslo-middleware-3.23.2.ebuild 2017 BLAKE2B d2f8a35b293150a27d0246eeffe725569b116aa9684ea66fe70b03f0b51e35cb29e044eaf9d95df9e038ca8cbf695046cafa7d6d491a068a335e34b1fd957365 SHA512 787517a41afe7a9cbc7dbd05bc94676c228d450d169dd2fa5c07cb99b7fd8479c85c2466d5fbac66d9e86c1362ad3131b017e3316361d4913601fd35937e3d9a
-EBUILD oslo-middleware-3.23.3.ebuild 2019 BLAKE2B 25b82e0eb4727de5ce4b16466ac221b0b7819a3b78c3c57c4b009347511aef0ba2121733b6bc06e7eeb1179ab894f949a4b4204d87a990c3885473d0266f4c06 SHA512 7aa9cddbfb46f17fbe49b58db3c744932e372c9a85299a797ceeeaef32f0fccd890a6fbd9e4862252f580b8671c82e4a1921f937b878997b210f3138098441d6
 EBUILD oslo-middleware-3.30.1.ebuild 2265 BLAKE2B 9fec3d7aa36fdd950281046c661df5d1826763a49d3c08215a0dc45ba151b6f019440f689fa34acdff22a01311946aea09f916259dbea15fddb7583350c90e75 SHA512 d1809bdc071a0187b4177b3088605b3a7ca66c8b50c23dc0a4ff3eb5bca33b7e374b65e2d660ae99d9088597c4c397815ca484e356c0ae7947f787c2667d035a
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild
deleted file mode 100644
index 67e9cbafb5fc..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild
+++ /dev/null
@@ -1,60 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild
deleted file mode 100644
index 9b958c92ba1e..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild
+++ /dev/null
@@ -1,60 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 94c0091d4e63..1bf4679a5050 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.policy-1.18.0.tar.gz 64504 BLAKE2B 10a8b950bb1b81edd3ffa201a08be626e197215189821f6d46e72c25bee2871821920e5a8ac83c89378a8fcc232daf5317c020c67d6001c2a988d9078d23f7c8 SHA512 e7d92d420a54da82988aaa481dc889fba1c954097895fa62fd232f2d129c9050541b6d2f63e59718420ee8b5a35039be4deb46a184fb1a1107b7239a58a299b8
 DIST oslo.policy-1.25.2.tar.gz 72984 BLAKE2B 7f2e4d48309082c1069ffcb561502c71b86e0c5508bb07cff943a1fc32fbbec8a232451937b678842909779e94b7eecdd5f2991152e0c8ca557a58b1ce137fc7 SHA512 8d66fe73d7b9d381c54997d980833e4e5d429a9ca28343adf777af20042694bf5dd878f9c1a9ed7168c075816e4b37263f9b520274bbdccbe0c6649b7cd7d213
-EBUILD oslo-policy-1.18.0.ebuild 1186 BLAKE2B c11dec4ee4e048372430dccf852bf61778d7aa4940c120025447cd96d4c4b5b5e69d2b5c85d82a074fa800fd28e51d2c217e62afe5f2a9d39db0ad4279a55e0e SHA512 2ef2cd9be315146b714b8b36dbc4a377c73f6c4577650bf53cd718bbe34f625b10c01b882cd5a827c35ea5fdb7daa1548c9bd0450f39ddcac14264a2428d9533
 EBUILD oslo-policy-1.25.2.ebuild 1322 BLAKE2B d2bce22aab9c3dd8dbabb2c7fa089baa3f4a4bd8f0148fd53d9b049e36eb2ad9d1603f7f3643d5c2c1d91de605f3e6605b116b670797d6e368c02f0a9a8213c6 SHA512 1e661429bb1e19c495a7f8b945e5762abc69b0293205761a5f4919749af44f5c3d32654ceb6ad31558dc8161ca1b17309130f98c737e91c71e86e889c8d30756
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
deleted file mode 100644
index a2986e4f27e8..000000000000
--- a/dev-python/oslo-policy/oslo-policy-1.18.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 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="Provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 63dae82b6cad..06e01194dcae 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.privsep-1.16.0.tar.gz 30448 BLAKE2B b1bdff6d168c4215728e8a3e84df9973bdd066882d8409d12fc736861f9a796c5591b1ea4d4f6397ba742e0a2e0b4cc731058e8e8924f0c8598d315b43fb72ca SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5
 DIST oslo.privsep-1.22.1.tar.gz 32602 BLAKE2B 1dff51174aaf3b8b8c2c5006e476f8b6f386f071cffd5038c9261af3696a7ab1e05e8ab400a6c15a1dc050363e991587d8234ee6a99dfacd20f10162779766df SHA512 fc71b92b9a73e9de5003bf3e9288eca6a128c8d98abb51e5e372823a8ad549aa484bec3ab2bd0ccffe527282f96f12dd02c0bdcd0680b123649ac452ad4c0a7e
-EBUILD oslo-privsep-1.16.0.ebuild 1569 BLAKE2B 6e3cc5258fe489407beb7c661c89e491e10bf1ac991233baeabc6f84569b8b605be6228ff3bba07df8e7949b9f9232323b4ff897af583ac3e5858dfc81b78435 SHA512 74b826948de43144eb62e8221a2e15ce37f10a436975faaa287d8d16d6d28d570467256c7202ac7965f622011c9b593879e09f9c1d0898cce4b400fc333f11d8
 EBUILD oslo-privsep-1.22.1.ebuild 1794 BLAKE2B 1bc84d099ab37d2ede53ae4347e6e76f5b0420a71a66386d676f1196c0afea30367abdbf5c510d49f9c771ea4d6274a668ec3ad73811bbf2b259ab779dd037e0 SHA512 d69fc20db1a3aa80f5c79b19d9eaff293dcd11ecbe0ddadbe1c8ca9f7935a9522108de8103f83e037e5ae4fe49abe293bd842b14ac1da6402d8c241ee6015278
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
deleted file mode 100644
index a69b8431978b..000000000000
--- a/dev-python/oslo-privsep/oslo-privsep-1.16.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=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
-S="${WORKDIR}/oslo.privsep-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# python_test() {
-# }
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index b5d16b668ba4..b54768435420 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.rootwrap-5.4.2.tar.gz 42789 BLAKE2B f6587ff6f57bbef75f39808373b6d76b86fb0cbb5129c0c3421aceeab29ecfc5b2cab61471dc80d7ce4a6519a432b4d572f158ac513c7a76ec4148f717346e44 SHA512 32f692248e4006e5809edb2669d4f1105cd8592c69b36bd17c4cac786f26face4971e60505e7d2d775d4b2f54a369c7acdfb3da85e19dbd96d65203f5d8df7a7
 DIST oslo.rootwrap-5.9.2.tar.gz 43716 BLAKE2B 4e455fe52c6f20824bf220a8444dfcdc916dfd85f0ff42edf8e3a6b8a065a45344122f56272943cc06f88fc272522af9914dd2a961d3c98c30ba66741419aa1e SHA512 3ad7c2d028c3052476bc26c00bf34c421b44db59cae2d45b5d1041902c14227f6de89a9b8fb36f123c9a9e477dcee42e567425439d9d3eb12a5f701c5a13be6b
-EBUILD oslo-rootwrap-5.4.2.ebuild 1539 BLAKE2B 6f80ce9109cff652cd2c1d62ec00e144556ae3d5bddf910eac551ed6875f950810058f7acd046afbbc345f5e7bb027a62744fe57309a0013add5da5758d907a9 SHA512 6c0935fd483284d8c3eccfb31452129360a4293f73bb2bb40f083a51406acdce4a1f32cbfde5e41deae710cb1d29820b0bc62019d08683be334cdfc943ccf026
 EBUILD oslo-rootwrap-5.9.2.ebuild 1669 BLAKE2B 53d58d7ca0a805c8135b2c838cc0df32a2b505c02831d6a386b7809159528fe098f6afc69ec96c06af513a8004b2e811730734e6874c29f6284dc146414aa430 SHA512 319d8a02de07d5a621a0945b08db483ad8d01b81cce61171f6cd816ec15bc52f3e6bbac203b4145835f08073a792534861db938ad7ef6f44830ca41f01cc38c9
 MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild
deleted file mode 100644
index 82a554a79ab4..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild
+++ /dev/null
@@ -1,47 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 06b1a43ce79a..e5365f08a6f2 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.vmware-2.17.1.tar.gz 205998 BLAKE2B 0aaa54856d127d7cf3f6aa6fbb0a8c36b881db1e39462d4be53104c5f001a14ee0cfdf00ff2baae9f32d78bc1f610f8c832c0489ff24e66fd8968f97af021f32 SHA512 da8516733ffd10821691e56ca036942dc9f1043452999b42f115e87c83ccb79058bcaea604b7ca990f53f4dd4ad7302989b417ca179898523fade5b136fbca85
 DIST oslo.vmware-2.23.1.tar.gz 210844 BLAKE2B fd7f86e4a8e97d98e0e309ad1e3c57c5952699300c6da0d5641fc61e14cb85445b95767382ede7bac14c125f0f6fa78f7284af5d6fefd774e4a8b5543a0e2ac8 SHA512 bf0dfc66a57cfee824fe9ec4a9dea23e6d136fa04fc2e9f3455409b899fc49ce2f2979e072d25d0e0026fb300aef1d6e1f2e72113bd7ec9beef0122d47b71eac
-EBUILD oslo-vmware-2.17.1.ebuild 2121 BLAKE2B 5cb9973a08a3c3dc4e787c27a7d23dfe8a52030d8b99678bafa2a4881a94849473196f0e0aeb9f66ef967b697d4cd272b3d738c5f264d881aa6edf12fe805068 SHA512 2b44465761de1f20502d630e3a700ee13e0cf80c59e2af166d00f553b99889ad580846989c8d28dabdda7caf824cf0fe11a520a6d27448a6889b7de31abdac50
 EBUILD oslo-vmware-2.23.1.ebuild 2340 BLAKE2B 5e99ff3f8a4f3f2fb0e27137843d5ad3408a997aaaa3cecdb0a989e89c05b938493649316db4c2519e0b42ee25c1a7e8445f8f69ffc23afb779773e733df7d98 SHA512 3101e41ee0c7eb3568281d23c98dd51c4916e8f247e5f31faecc95db324be94497a896204abbe2d1e9c36da2997ad56ddeb5a417d6e93dea1632dd00713c6f2e
 MISC metadata.xml 568 BLAKE2B e5ba6d5e5d14ace6be413a2bc6d97d8dd5f6befd0cfe683fdb6bb870cef7b673cc779ab143362b48181f62fa4f15eb827174f17da64c4d7ed539eef74e050136 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild
deleted file mode 100644
index ec1d49fecfed..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild
+++ /dev/null
@@ -1,63 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/^suds-jurko/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 24261b329ad2..42792d7d11ff 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,3 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
-DIST oslotest-2.4.0.tar.gz 26392 BLAKE2B b34d478f9d18cf6582544499555c6daae5cd47e47731b17c835833b7cbbb65c652602c6642c0c682b0690dde495f5014b454a3c9e0a56b2f69b278935ebadd7c SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886
 EBUILD oslotest-2.17.1.ebuild 1810 BLAKE2B 0596613272772ab853921abe8e261e998cd836515f1c19810b4ceaf48a03541b9ca7f9da0e5787e0a769f5eb3c961f064308853c991073dec6a28f3366e88840 SHA512 957fe51f09042979f9d65b867b71ba7579a0868b225a75a8490982bbb48ef0896634fd3d2cf18cbf46d4e93990919eff66d6c8fb97797d006161ba0cf9f9d656
-EBUILD oslotest-2.4.0.ebuild 1720 BLAKE2B 7d9c6693e8e416509829a3e670bddaf35437f3a7534e4dfd955a3bcb80ecc002154c92cf813f5a5c8a3b2794799de82fad7cfa950010016cafd6793f7d5b25d5 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.4.0.ebuild b/dev-python/oslotest/oslotest-2.4.0.ebuild
deleted file mode 100644
index 615478411aae..000000000000
--- a/dev-python/oslotest/oslotest-2.4.0.ebuild
+++ /dev/null
@@ -1,62 +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="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? ( >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] )
-	>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-	!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	else
-		esetup.py build_sphinx -b man
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/build/man/oslotest.1
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 13300861afff..073cc0745951 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,13 +1,8 @@
-AUX paramiko-1.16.0-install_requires.patch 438 BLAKE2B 3ce9ec44642fbed5532783f4799965b1392323b8fd86200c09171d90564e37cb14abc7211037f82981204adeff160e9d5337380c0ee4b6f179ee01c108a2c3e3 SHA512 ace0be9103050e397c584bd42077cbdd10296b0bd3fbf084dbd3242e3451d87c7cadb38d66bfebc128bce45eb1f1465f716c5004e586fd9f82a84a67002344a9
-DIST paramiko-1.16.0.tar.gz 1335094 BLAKE2B 03d95d50b9a03a112074687b294c628de40400cded065bb89371e3f9a10d373c0b419365a56e6e04e2ec3ff7c4b6dbda4952f920f93941bf06ba3413fd4e79e2 SHA512 d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962
 DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
 DIST paramiko-2.2.1.tar.gz 1205818 BLAKE2B 6b9007c2f653d6e640de4051bb16e5b9a4d039b59b38cb3500d6b2935e4e9e4acddecb0b1eb404f8bc6c5ea94a90cbc9a405ae5189efa0b9026d0550fcd9f259 SHA512 6aa2cce301f32c15d66e2137bc8a5c10ea4a667c599b24047a1e176b10636fe3abd28c7b2974befdde432a86c924acceace056c0572ea3006d3e4a8160b725c3
-DIST paramiko-2.3.0.tar.gz 279279 BLAKE2B 64db3412ac5b64ca345a978442062b9ff14e70ca7bbec85c807421df7dbb47166c694e9882508c2c9eefca37ae12233da3c696212a574bccd16015afbaa6c7ad SHA512 a7935b76805a938e389fcf38beca0eb653cc1bc370ed7869726361d5758235d282e747c42582781c122f7c8e4299e61292c1ac96dc3921d44aedaf8a699c1ebc
 DIST paramiko-2.3.1.tar.gz 282553 BLAKE2B 298bf73d2ecbb47506a7e3b7a03ddd650c8f126ef21b0e443602327a7011ee55c146aa3b6e4d160b47680b50dab3fcf04843597a290ccb166f88fc129bd85a67 SHA512 b63a177f1f03937d5650d6f2a3ca4c00e0c3ffb0080e5e5a8141aab435c3ad415f5af8c61cb2894d176544b854ff26ee510eaa41081b452dfa6213cdc0566665
-EBUILD paramiko-1.16.0.ebuild 1194 BLAKE2B 8e55b80178aecfa56ea22674713a5462b5ea07e777236cb7be4b05d7b2ea4cad15a7f3ac748643dcf9717ce61dd5d33dc294176031d9c0fb855782e4f9ba2d88 SHA512 98dc8c3ee704b82e0f5d9ee05f4f46ef3acf1078ca9ade31e7d19e0f3a14390b299ffd503f4ce10c19e0cfe2f7cc35e22a89533494333ae7cc46d7b8b6efb511
 EBUILD paramiko-2.1.2.ebuild 1141 BLAKE2B 52ec975ac82f1921d19aa7264583a90bb081da736bafb0e0bb75e14e4b84df19d9759d10716375f659cfcf73c1a0e7a20e90d2cae240988713e215966a482cbc SHA512 db85d4e8c14a284c8f82c58a805362fb85c0bc15da075dd86e456ed4e439b35cee278574de5c8ef0496685c1d769dd103e4772f82bcecd2a8d7c691d5416101d
 EBUILD paramiko-2.2.1.ebuild 1092 BLAKE2B 8e157c06cd2964dfcebf1b01203d2f2db544a4043e5dacb94397d6259b5fc7e287142e764c7f062337d94568b91ef3276425f3348fa7db2eed597d9eb0a940f3 SHA512 697f81342eaee5a53ce0dc9dd49900c0ee8c9fa5d1a01a8b2d33165ea2b1dcaf7e429f049a586738f30b5e121e6d36471b011612e33244e77b7729dbb0a848ca
-EBUILD paramiko-2.3.0.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
 EBUILD paramiko-2.3.1.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
 EBUILD paramiko-9999.ebuild 973 BLAKE2B 8699c5195a985d92b6c00a6c5197e08926fe19dc6328b1a819ea40c0729bbaac0fd6910429ee4e214e253fe2a007af0eb66f2e86cb872ab73dfa084c17e14e79 SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa
 MISC metadata.xml 1236 BLAKE2B 5b1a6c8a5694722970f07206173fd1dec4a69d0be780ab408493c5c5ac96a058cd28ffcd3308390870244792b951e8fa76430fa3b2b081902e204055aadf4b2b SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529
diff --git a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
deleted file mode 100644
index fde5e11b19e5..000000000000
--- a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 629c28f..e987dc6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -41,8 +41,8 @@ try:
-     from setuptools import setup
-     kw = {
-         'install_requires': [
--            'pycrypto >= 2.1, != 2.4',
--            'ecdsa >= 0.11',
-+            'pycrypto >=2.1,!=2.4',
-+            'ecdsa >=0.11',
-         ],
-     }
- except ImportError:
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild b/dev-python/paramiko/paramiko-1.16.0.ebuild
deleted file mode 100644
index d0620934429f..000000000000
--- a/dev-python/paramiko/paramiko-1.16.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=( 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/pycrypto-2.1[${PYTHON_USEDEP}]
-	!=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-install_requires.patch
-)
-
-python_test() {
-	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-2.3.0.ebuild b/dev-python/paramiko/paramiko-2.3.0.ebuild
deleted file mode 100644
index 106bbe8627d3..000000000000
--- a/dev-python/paramiko/paramiko-2.3.0.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="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
-# pypi tarballs are missing test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	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_compile_all() {
-	use doc && esetup.py build_sphinx -s sites/docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 52e4258aa14a..897bba0e7efe 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.1.0.tar.gz 30390 BLAKE2B e009fa866dcdb2a6f078d746c423484bd90df049d59c89427c631cd63ac11376bb5549f45f0e98da036b15c6674040ffc8844fc08b95abb1d677783dedf9e126 SHA512 5dad54d4bf7a37a2c425afeca030a23d802a8a450186292f3d80aa9ee5c2985701871a0386a2f58e2b05b4bbfd7734a238d0a73625c5839237e4f3984088a8b1
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 EBUILD pathlib2-2.1.0.ebuild 581 BLAKE2B 62d3e1f8e2705db80933876650fa594a8986cf3b74c78039925ca9dc024ddd979491ae254a7b09c1ed83cce2464fbfeccc16106724254373efffc28987aa7f4a SHA512 e14f2bb06e96e63d9812e31da3a27ce9b9d56f1405515c29df695167e48e7f4122f778688f66a20b8ef15630b5dd4fa7affea9b9946362b7124ded7ff0ae2ce3
-EBUILD pathlib2-2.3.0.ebuild 668 BLAKE2B 8f7a9525482373ef12b9bd79e00dbd66256e910bbf8ab9f60e84eb90eaecb434af13112c71143f4e738a0193076dd1840ac95e4bcd1a2e21787498ab92945079 SHA512 c25986ad6b02d55d779cc8cc9fac40a7b1a2c13162405eefacedf7b25187557910b8da4bc5ea83a0cd2eddc73003f311b1243a4cea18b81af034341ab7c7a35b
+EBUILD pathlib2-2.3.0.ebuild 675 BLAKE2B 29916d5d48a2dc959f67c40b3052b7858cb924efaaee592eabf2f7f4ef957e5baac1f1599dc44bdd918ba369565a2917a3ea6b32b48f5e38af20b627b7c38c82 SHA512 6b90c2b554f82246f6bde18cedfc6bda2204848bb565d4af5c76fe8f81ed3079ee7abeddbe03dd699da7a6efc2d6b75502c84782be1df09c107cf38ebf70bc2f
 MISC metadata.xml 371 BLAKE2B e2a18977882b53d7e6588147a17a9fe2c2a1b0850946b15036941b908ece241cace91e66373d5edaa4ac2ba46935413b223ea78cb6ca01b758673ef719b76966 SHA512 dce5315fa4bc25047346fbf06a9f2da5828475bf0b36a1dcdd6ea9917f29ed4bbefc22aba699a43d7b3c5f771939bd81b3da20df54537b22aa4811a19ab62a6e
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index e4c21c8d96a9..c23057673735 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index ea9ab9cdd251..ddc99eea39d8 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -4,4 +4,4 @@ DIST s3transfer-0.1.12.tar.gz 102902 BLAKE2B d0a211985753893b714863268d41f23f9de
 EBUILD s3transfer-0.1.10.ebuild 1030 BLAKE2B 1d5fc2cee9433164f63c29ad5e2859f2ad7d49abb52540eecfdec10dc24aab9d2b6ca3ee54b89b5bbb9f192bbe37f00aec177212d46d8ca1fc4031c1fe8b28fd SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
 EBUILD s3transfer-0.1.12.ebuild 1030 BLAKE2B 1d5fc2cee9433164f63c29ad5e2859f2ad7d49abb52540eecfdec10dc24aab9d2b6ca3ee54b89b5bbb9f192bbe37f00aec177212d46d8ca1fc4031c1fe8b28fd SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e
-MISC metadata.xml 565 BLAKE2B 06a2c8a3192c271e2228d6f29a42c0ef394ae3ab56c64ae8eb5320141e8a026decf4c2a3ab435a87cb246a3778185905362a864a9f38e83458de331386814517 SHA512 7513c3c2a64fb6af4c14f4b1e098b232101eec19cce1db55eb1b87d4d5f63e8ff99f8586f3c508786cf9045762d307430f12fc648fe0d553598cf418b224127f
+MISC metadata.xml 374 BLAKE2B b6ec2b22b3f28029b50cf61fd6b8a0b3df94e778dab810242a423c99c5d02f7b2f0935a698a1709f991775ecc1c7f83c574ae1d5d7beb3b8cfcfaf3701869fb8 SHA512 5e73ab91a18b6084bfe8e6d1ecc1c2637441426ebf9cc6f40e4c3656a4463e6988db4d000715a5a3e2e7c80a28c79749b2c41fad352544a0b8214030d85bbe10
diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
index 32397e5e07f7..45952a3153e7 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
 	<maintainer type="person">
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>klausman@gentoo.org</email>
-		<name>Tobias Klausmann</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/s3transfer</remote-id>
 		<remote-id type="pypi">s3transfer</remote-id>
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index ff26a3d9973b..d6dd52686e3d 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -2,7 +2,7 @@ DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af
 DIST thunarx-python-0.4.0.tar.bz2 332620 BLAKE2B 768a2a236e12d298efb3abc86f4a339548248f5f88366ec7d956249c028474612b15c340976ac2c2ced806a89517278c70b50069d76b2eee6af6dd097789e275 SHA512 fb54f83c11857ec2236a249895954efc29446120c192b8d19794b7e8145836969f87d1efa524bfaa4c9d31ee08a2c17a57d7210ce4a3a4982780d128839d02b1
 DIST thunarx-python-0.5.0.tar.bz2 334305 BLAKE2B f62e2e7c1faf9c218398d920c1079e82c72253e9ee547892e064f85a2ddb01ac84007ef0fbf4fd7e2bd39a80f74273a96604618f0ec4238f1cb292c97a550a8d SHA512 69350fb76e972fdbf63217e7a200642088816b803e637d3d7a1a909632115f5664cfe6e6bb90b640ed947416e0a0ab2761932a0c0219ccb7bcad767e6e07e7fe
 EBUILD thunarx-python-0.3.0-r1.ebuild 945 BLAKE2B 6e21b84d4696ef1a37125ffe6faf0a99747d4a86a4e8632fd46c567240dba91500d7dfe1fc2248e454f0451cda3de091efd5551b3be7115facab3cbf5d4d9ab0 SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781
-EBUILD thunarx-python-0.3.0-r2.ebuild 772 BLAKE2B ae1189ce1ed8d56f8f88d260913451c21a8e74942fa6239cb1545148f6e773b3eb0ef488c64ecf4114bbbb81af6e76d118af2d4ccf84f903a2c7187841a7d94a SHA512 b07942f687325fad89861bcc745623d2e8cc23a0bcc087f5a56924780bac33127af57069d02f8f24cb138a7f7422966c68fffe1a6dc143b1b65089dd304dc83a
+EBUILD thunarx-python-0.3.0-r2.ebuild 771 BLAKE2B 2a1103d798a4d928622c3cd39ee53066ff882e7299de780509f4164ea702684f28e93c2bdac205f9ac54a6f57aafd3e9851c2a2f3883fb529b559847e0614a99 SHA512 ebf179b1fb73d5e250e68da772fe102b7fef7497891e51f94e0fcd8713870016ee308c8a3f5557b2eb26b5bf69bd748b3f8789916a6c340742b62fbe46522297
 EBUILD thunarx-python-0.4.0.ebuild 753 BLAKE2B 271f58f98f3b0487625d72e037cd5fd6470ca5fc282ad510e89e75e9fbb970101faf830c0801be1b3113e0bc7cc6b99eb07fd0d6195a267d45029e79727bc403 SHA512 c054426c2f48de127413768a92774c8da2ead3a66c111863e71b7a14853190b3af7bae4d33db26aac18e0d935bfc86c78c05392e4834f5f9ad6fee19b7997f72
 EBUILD thunarx-python-0.5.0.ebuild 725 BLAKE2B e79c7d63dafd5dead64a3f09c122a0834fd3d839cb2d31585ed166d1dea15f46c03d46aac2796c8e3ed9f39ce16bb7d51c2d8899512d9bc20932d9af110a02c0 SHA512 815c6b5b061a19b1cca054343a115644ba60736eaef2c5ff01cbdacb071c30c9b58b74422db443ef49bd30b3d6dadbd508317db32e94cf778130b9462842fe0a
 MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
diff --git a/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild b/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
index 437e445d932b..b996d1b1962f 100644
--- a/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/bindings/${PN}/0.3/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}