gentoo resync : 03.01.2018

168 files changed, 230 insertions, 4064 deletions

diff --git a/dev-python/Babel/Babel-2.1.1.ebuild b/dev-python/Babel/Babel-2.1.1.ebuild
deleted file mode 100644
index 8d2b76ef7aba..000000000000
--- a/dev-python/Babel/Babel-2.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Babel-2.3.4.ebuild b/dev-python/Babel/Babel-2.3.4.ebuild
deleted file mode 100644
index c333bf32f4e1..000000000000
--- a/dev-python/Babel/Babel-2.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
-)
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Babel-2.4.0.ebuild b/dev-python/Babel/Babel-2.4.0.ebuild
deleted file mode 100644
index 9ec087d4bd7e..000000000000
--- a/dev-python/Babel/Babel-2.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 1bb175b3cd43..5add97696bbb 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,10 +1,3 @@
-AUX 2.3-Fix-the-way-local-time-is-constructed-in-tests.patch 1297 BLAKE2B 05a873821aab060c5ade38e587dcbe3f83819c68d82655875b8bb422a635436de8535bc48d6b2f696b562605901e07c1ba892336a500b413fdeb3e224f7b2939 SHA512 271219651c716d5224887de5ea2c1f49cba9d4a9f2177a3f902bf59cb32a639803db39cb5b4af4e4fc201d1188ca94d0a27bd0ec0a583562eb02bbfc263e4147
-DIST Babel-2.1.1.tar.gz 3437647 BLAKE2B 0007a2225e99e5643d36527d3b84f330df5e9010a4ef8e920da90bce7389a0504fc889fe6e149e756f51db2ebd77eff04c7e5c6295e01f4225bfef9d6e1de790 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94
-DIST Babel-2.3.4.tar.gz 6866920 BLAKE2B 2f4b5d33364e20aef2ef47fe606dd0d531fc00ea80556584d3493c4b5af497a096c45c79683405a878a64c119730789f51ddcb993ee75e403f0097878b95871a SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5
-DIST Babel-2.4.0.tar.gz 6607513 BLAKE2B 2936a0eb1ea0ecae827681f1a86e3fd66c4952c4563b1b5e01c81695a233abe59c2b63c4c2aa6c0e71934f004aaea459ad0ecee73aab0780c47d7d41b2ee00db SHA512 4e1341144dfb319c172a446facc47204c9b9f49972c8646b62e082975d8ec41c35e503e610d7114ef5346a5c073e87ed8d40a65a60d9540fb7ca947681cc0beb
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
-EBUILD Babel-2.1.1.ebuild 1495 BLAKE2B ed244b2540d2dd2d3e710ba9d1f460f5770ff983f630392b28891c5535635e7cd80ec92b78d57865ed48ab7a7100979335b43be156082a414e70a7d1d4f12380 SHA512 85b81166d42016f337e903680a762f4eb7affc4eda2318b59cdc96552ba75185486eaa1071a82a13a60946e8a90fcbd7fb89cadfb538310bdd8fb2cd6c7fb5dc
-EBUILD Babel-2.3.4.ebuild 1560 BLAKE2B f0c4bd4d9dbea63742ef4d08baea9854cac7ccb9c3d03545db9dfc2f5034a2556aadbdc6610cd5430934b2ffc750cca507e9a4a3b12160356d9036948f5830bd SHA512 a88248213a2e4aaf0a9573b361fc1630546ffc2a2663dccba5ca069532a58196b05e144be534a26f20a11cc1b4ae3683ec42f035d4ae1bacaebf80c92221da7e
-EBUILD Babel-2.4.0.ebuild 1474 BLAKE2B e864707240604b5b75ef481cae5576ceb35df789066b19750271e20d6f2115c9866e7626f5d81dce9b140641389e1fd56fba01ff525511a0fc821bcd8067bef6 SHA512 1afd189043b07ad3881de87fd5c38c1432dfae22b4375457dc7135d420a4fd3e0f12062f7011828835ce580de81263865255c83ee25ecaf66e1742005388f93d
 EBUILD Babel-2.5.0.ebuild 1478 BLAKE2B da47fe484e7ba77accc70eeb238fe0fa4a6b019c5492fa38cfc1748e5bac99a4c2b5d5ccb523247bac9135e3239eb102465c702959d63c07504e558ea61adfc4 SHA512 ba5ca1a1b6f0d2c4fcb9cd99c2b884e1b2538e6da545cc3d7b5d20c2ae7b2e4aedcfd910ba128401a970215d21851a6919765008e37e38e4ad1e1fa38160abc4
 MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
diff --git a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch b/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
deleted file mode 100644
index fdfb31d7c62a..000000000000
--- a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 476515c2418039e471656f47efbfc43e5230c1fd Mon Sep 17 00:00:00 2001
-From: Isaac Jurado <diptongo@gmail.com>
-Date: Sun, 29 May 2016 10:50:42 +0200
-Subject: [PATCH] Fix the way local time is constructed in tests
-
-In summer time zones, the test for "get_timezone_name" failed because the
-construct used to obtain a local time did not deal properly with DST offsets.
-As recommended by pytz, it is better to convert to local time from UTC.
----
- tests/test_dates.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_dates.py b/tests/test_dates.py
-index 3bb9e8b..b0d093e 100644
---- a/tests/test_dates.py
-+++ b/tests/test_dates.py
-@@ -624,8 +624,9 @@ def test_get_timezone_name():
-     assert dates.get_timezone_name(tz, locale='en', width='long',
-                                    zone_variant='daylight') == u'Pacific Daylight Time'
- 
-+    localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
-     assert (dates.get_timezone_name(None, locale='en_US') ==
--            dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
-+            dates.get_timezone_name(localnow, locale='en_US'))
- 
-     assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
- 
--- 
-2.13.0
-
diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
index 8e2cb32ef0b7..0a913ae26c12 100644
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.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
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P,,}"
 
+PATCHES=(
+	"${FILESDIR}/modplug-fix.patch"
+)
+
 python_prepare_all() {
 # 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
 # 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 1ad9c02fd521..a321a24acff1 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,6 +1,7 @@
+AUX modplug-fix.patch 4854 BLAKE2B 7552e40f790de3385c7916820a6b6429917d7a6353da48a283239129fc45f7e6540a01b3178f7e70becb8f342107ad3f16b78a363d8e67247f67cbe6491d65de SHA512 07db881b817b951e20be355e926375b34a2e0b43942322d83550ff99b07e434871a0a15c1a0e9ac9eba76fff96ca8221f9f02ec1ba31b1ddbd10b567ac237fa7
 DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
 DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989
-EBUILD Kivy-1.10.0.ebuild 1886 BLAKE2B fe0e4b464a480937bba9ef640589692c82ba2c598a4c66bf76f5dc4d47f062be45afe2318acd1889e5d3102fe41b26fc41677d5404a0c6d842233602cd6306a9 SHA512 05e85109be9d060906c163135a1a03b1a3271d2501960509ea902df497f039664fe8c0700a7c5536631dac2ff29acd587944014b3dffd687999d39ce33a4e0c1
+EBUILD Kivy-1.10.0.ebuild 1932 BLAKE2B 9799fa92373b871c89d924e94c67bc63bd1ad5f0ce7fafd73be01e237b36e3df98fdb4a694ab8825060bdaa2f835b123e63d754a9a4dfa733debbe32c3da5875 SHA512 cb99077cab4379a726cfe0bb1120c845339e6fbffe0d2eb0a41c39a5108cc6cfc2f6bb2b6a41fed883816c70f1aec2dc80bce16f1f53b9dfa33bd7cfaac54718
 EBUILD Kivy-1.9.1-r1.ebuild 1878 BLAKE2B 47e6ddeca7f90ec97efe78149981a6b804f534ca05341253e08091e9fbe882cdf454b4cb0c8ff205a92f311dc74017b4132c4c7de4c039a40a5aca85aa68cad9 SHA512 ec4a0bed0781244d0bc16730c7ceb7584a182a60b326dc1f8063963157089bf727bf2a5504f1c0bed2d265d3883c6a2d21d7f348cd9ccd05dd0195b11734fa11
 EBUILD Kivy-1.9.1.ebuild 1794 BLAKE2B 2760cf176c8aaade4b11945f42768bd5a6fd423554f168070831e10025ab78757e61ccf8dc63342aabebb622f5121368a5cf8b67ba470a37f4d99992882e6115 SHA512 7d50f1e6cf0553c2cae357a2a50881961a94a061cfaae27b60f3d7ab159f306902a23fe26ee5fe193ffb2e045cb7e88273151a0a4aff4fb16a2c0f1e3ca139a8
 MISC metadata.xml 490 BLAKE2B fca6a6372250ac811cf7520b98a2d26d5951030b56fa7d62ef85c3554025bb57a55371def39747d7597b42bd9dea44104892c75a2ecb58904de423ac4260c40e SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb
diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch
new file mode 100644
index 000000000000..18abe6e8f807
--- /dev/null
+++ b/dev-python/Kivy/files/modplug-fix.patch
@@ -0,0 +1,109 @@
+From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001
+From: Terje Skjaeveland <terje.skjaeveland@gmail.com>
+Date: Sun, 29 Oct 2017 12:35:46 +0100
+Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support
+
+Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
+renamed to MIX_INIT_MID.
+---
+ kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++-------------
+ kivy/lib/sdl2.pxi              |  4 ++--
+ 2 files changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx
+index 2ab569fe60..c6f26be5c8 100644
+--- a/kivy/core/audio/audio_sdl2.pyx
++++ b/kivy/core/audio/audio_sdl2.pyx
+@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries:
+ * ogg since 1.9.1 (mixer needs libvorbis/libogg)
+ * flac since 1.9.1 (mixer needs libflac)
+ * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps)
++  * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used
+ * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs
+   libmodplug or libmikmod)
+ 
++.. Note::
++
++    Sequenced format support changed with mixer v2.0.2. If mixer is
++    linked with one of libmodplug or libmikmod, format support for
++    both libraries is assumed. This will work perfectly with formats
++    upported by both libraries, but if you were to try to load an
++    obscure format (like `apun` file with mikmod only), it will fail.
++
++    * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2
++      will report correct format support with < 2.0.2
++    * Kivy >= 1.10.1: will build with old and new mixer, and
++      will "guesstimate" sequenced format support
++
+ .. Warning::
+ 
+     Sequenced formats use the SDL2 Mixer music channel, you can only play
+@@ -57,8 +71,13 @@ cdef mix_init():
+         mix_is_init = -1
+         return 0
+ 
++    # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD,
++    # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous
++    # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH.
++    # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID
++    # 0x4  used to be MIX_INIT_MODPLUG before 2.0.2
+     want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3
+-    want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH
++    want_flags |= MIX_INIT_MOD | 0x20 | 0x4
+ 
+     mix_flags = Mix_Init(want_flags)
+ 
+@@ -244,25 +263,23 @@ class MusicSDL2(Sound):
+     @staticmethod
+     def extensions():
+         mix_init()
++        # FIXME: this should probably evolve to use the new has_music()
++        #        interface to determine format support
+ 
+         # Assume native midi support (defaults to enabled), but may use
+         # modplug, fluidsynth or timidity in reality. It may also be
+         # disabled completely, in which case loading it will fail
+         extensions = set(['mid', 'midi'])
+ 
+-        # libmodplug, may be incomplete
+-        if mix_flags & MIX_INIT_MODPLUG:
+-            extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf',
+-                               'dsm', 'far', 'it', 'j2b', 'mdl', 'med',
+-                               'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm',
+-                               'ptm', 's3m', 'stm', 'ult', 'umx', 'xm'])
+-
+-        # libmikmod, may be incomplete
+-        if mix_flags & MIX_INIT_MOD:
+-            extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm',
+-                               'gt2', 'it',  'med', 'mod', 'mtm', 'okt',
+-                               's3m', 'stm', 'stx', 'ult', 'umx', 'uni',
+-                               'xm'])
++        # libmodplug and libmikmod, may be incomplete.
++        # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG
++        if mix_flags & (MIX_INIT_MOD | 0x4):
++            extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm',
++                               'dmf', 'dsm', 'far', 'gdm', 'it',   'j2b',
++                               'mdl', 'med', 'mod', 'mt2', 'mtm',  'okt',
++                               'pat', 'psm', 'ptm', 's3m', 'stm',  'stx',
++                               'ult', 'umx', 'uni', 'xm'])
++
+         return list(extensions)
+ 
+     def __init__(self, **kwargs):
+diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi
+index 07d055c903..ad62ce8023 100644
+--- a/kivy/lib/sdl2.pxi
++++ b/kivy/lib/sdl2.pxi
+@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h":
+     ctypedef enum MIX_InitFlags:
+         MIX_INIT_FLAC        = 0x00000001
+         MIX_INIT_MOD         = 0x00000002
+-        MIX_INIT_MODPLUG     = 0x00000004
++        MIX_INIT_MODPLUG     = 0x00000004 # Removed in mixer 2.0.2
+         MIX_INIT_MP3         = 0x00000008
+         MIX_INIT_OGG         = 0x00000010
+-        MIX_INIT_FLUIDSYNTH  = 0x00000020
++        MIX_INIT_MID         = 0x00000020 # Previously _FLUIDSYNTH
+ 
+     cdef int MIX_MAX_VOLUME
+ 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 497848e3c5c3..69fceb63cf14 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index df2727424f62..4334ab798e80 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,7 +1,5 @@
-DIST PyContracts-1.7.15.tar.gz 89602 BLAKE2B 76cf500392bb06e649a1f6c5715709728ded871920e3e3a1e4fc1c239e04e0425e8d250638d9157db7abfbcd378a793cfa85481ac9f8e3a6740ca92615e4b845 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
-EBUILD PyContracts-1.7.15.ebuild 1083 BLAKE2B 4c16c2a067f82d57a7f3cf70e5d8e19be7b4121520627235b951c471506e4c8b981b81f3a9abde4b6bbcb72542c67786fc8eb00be1be119822d8ba4f9ec218fc SHA512 078e6b88ac948424b846d3ed471ba4037158b3aa3602cefdc60a87869c22a9a12ef792f7f1737a1b459bc451c5b7b74d7853041d6e0e1082a88523400ca9cd05
 EBUILD PyContracts-1.7.9.ebuild 1073 BLAKE2B 6c837dd274562c95e7a4a3d33004415329c65a7f84c30b5702e21692980737400b8e43c229ae28193108d4b228695b66f9361d090935ef5724c781010960e9f9 SHA512 584c68b750dca3c839b5892b4d4324be67ee981f754c39d5cfdc3039a64793357c5ffd0f234a9f80867b1421f3c514f0a8d22d80cdfb66153b2148ad458a3d5a
 EBUILD PyContracts-1.8.0.ebuild 1083 BLAKE2B 724d18a880b8b0fd48cbe5078333c49ee45245fbfb915f58ceba723b6251b27bceb98cf00cb421bada88dbca4d89cc7e786a20bb16fba0e9192edd8490d4ceba SHA512 996ec9f99087c5333cb9a64c27ea588fa91d1ced155350d6778d408334b76783265a2034d8b3c27d51773e249b8dabe5e50bfed1533ef2201ff9188df8822ebf
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.7.15.ebuild b/dev-python/PyContracts/PyContracts-1.7.15.ebuild
deleted file mode 100644
index d3cb547abe47..000000000000
--- a/dev-python/PyContracts/PyContracts-1.7.15.ebuild
+++ /dev/null
@@ -1,36 +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="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Upstream allows tests to fail
-RESTRICT=test
-
-python_test() {
-	nosetests \
-		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
-		|| die
-}
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 009110921320..b77966b40a52 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,5 +1,3 @@
-DIST pyeclib-1.4.0.tar.gz 6682441 BLAKE2B 284c7b7357b42e758878496dcf795c737e63579eca28d7bc8dc35ef055a693f5bee235e34778850bc373300da3da3f8fc78c4065aab5d59b3efbd840dc9e12a1 SHA512 849da9ad32e26ca4e923bc00482734d6431bdcf402eff6b0c5ead4264c7be9e8502eb0bea6e60fa8565d361d9d7d81e01e38fd3c85c4e87c4d6b8b30be328e0c
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
-EBUILD PyECLib-1.4.0.ebuild 604 BLAKE2B 2d6ae62e4a7010f82d7fb0ceb9e15ef259ebe8fc5e7101823117fa4384a1d2067fe834fafa9f5e73991e15078a9542fcaf4aabd69bfac42cba3f0512f02fb9d5 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159
 EBUILD PyECLib-1.5.0.ebuild 604 BLAKE2B 2d6ae62e4a7010f82d7fb0ceb9e15ef259ebe8fc5e7101823117fa4384a1d2067fe834fafa9f5e73991e15078a9542fcaf4aabd69bfac42cba3f0512f02fb9d5 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
diff --git a/dev-python/PyECLib/PyECLib-1.4.0.ebuild b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
deleted file mode 100644
index 7d57a5c8f14a..000000000000
--- a/dev-python/PyECLib/PyECLib-1.4.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=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index cc9f6cac4922..458a81006e44 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,6 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
-DIST PyPDF2-1.24.tar.gz 59891 BLAKE2B 6d36949a956b26f37ea9a5f1b5fe9be8cb0406dc9e461e8f54eb46ee28711d83746e6ed1cfdb6c051ac6eac70199cfe26c3611176ab73577dea88b5854fca1e0 SHA512 91a9338b0338eee1cfddc25dd0f21494f73696e630b08a71ff9195fe7b0fc77cf6c07b38a0c6aa4856536be6fe0a474c3b292c13fdd0187b62cb8848e69b29f9
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.24.ebuild 530 BLAKE2B 3a97b6e818c7ff26286cb7a0825ec194e1ce6f90c5d47bba87d58ff754c1ece509db223193eb4bf2be7ea52959f8b418349082e6693bc760ea2ee66fed15fec8 SHA512 7cbc92890486dc3c906f0ef41f525ffa9a53eacae98fddbafd8f3d17d3893bc0179dd0ef1dcedfb60678aa20de90c41e5ec0e53c0fa8bd8d12aba3c78863a7b5
 EBUILD PyPDF2-1.26.0.ebuild 750 BLAKE2B 71043940d5ad08b3457341e4e12a99f4f2f12a733711898626b1b1a5bd8fae60c93857bf2947371fbdf56dcb7df02904aa769b65ad8cbea622fac601e02ea5bc SHA512 5cad2921a1cf55c56d3efaf02e9e6531aab4c62ef0ae4ecdb4e83a92301a72882a51aafe1799df307fbb12f7e3b3e9ad597e49bcad2add608c6ce335bcedf572
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.24.ebuild b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
deleted file mode 100644
index 598db4a46387..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.24.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://mstamy2.github.com/PyPDF2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-python_install_all() {
-	use examples && local EXAMPLES=( Sample_Code/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index eb39656e5655..80549b4eacb4 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,5 +1,3 @@
-DIST PySocks-1.5.6.tar.gz 9189 BLAKE2B 50833088e06bc3b4de5be7c0bd7ad7044f291a655cfb548e12353fdc1563750712f261dc6105343f6bed242690bfd9224e23b2e32cbc6672ed78496da7930eb0 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
-EBUILD PySocks-1.5.6.ebuild 495 BLAKE2B 9156c7ccd2004bfbdc73642a56a357da10b04e6b56f155f33f43625c9aed704a8d30756279337c27c053f0e1f337469549c567280cd424340607dfe95b0d9a11 SHA512 a3af1e5e7ce367a389ce73f7252623531911108d4bb6b5cd526b45d63acd1ffd332f103accfe6c51650c0d769ed8f215f2b27808e819206ed5eb6276504a2251
 EBUILD PySocks-1.6.7.ebuild 574 BLAKE2B 14dd042f02fc3a3e4b843eee945a5e4078bc8d8b88da4fb9d9099ec82b3eade8b35272911851489bc1d21df41d3e01a51db3c4cf0968c9630af21af94ee88e3d SHA512 fdfb0e14767e95243a160987cecafeb77a6daef62f03d7b0c45784970181ec97545548a6a0522c326e2f4b3a587f35afd597abaaec8ae420e6780dad408f06f8
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.5.6.ebuild b/dev-python/PySocks/PySocks-1.5.6.ebuild
deleted file mode 100644
index dfbcd5cbc53c..000000000000
--- a/dev-python/PySocks/PySocks-1.5.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index c88df00776c3..ff068c384f16 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,7 +1,5 @@
 DIST SaltTesting-2015.7.10.tar.gz 77163 BLAKE2B 974c0f336da7c7222501cce31e5ebd5946901337bc185b24ce6e3efa5780924894e4293a8fc80dedbc85ea3e442dd6c793d75d1a4094c5f4e6960a60f3a9000d SHA512 8f8979fcbb13ff6f56c67d726aaa95a5e9fb0e73338487b87d72acdf4621f327bdc6944f5e27baee46f15d3537c7b37321aa5535d1b6d4b88c79c0c72acfb099
-DIST SaltTesting-2017.2.23.tar.gz 91715 BLAKE2B 477f1c633842b48e084630bd4f4c18f9345a48c7755e024dc13d57ee09222e1317add5edfddb14541a513d257bbdf4a741c6003a409278a0c33bbfeec23ec116 SHA512 d45085463dadcce3ab91b496cd580c5d091d875258e791d7c9c60746d8c1367471aea6ea855551116f505a43afbead83d14a44e2f40f1acd0d55d5367bcccd03
 DIST SaltTesting-2017.6.1.tar.gz 90438 BLAKE2B 2d24dc88e8e352d027cf7bdf58a05afe7ec189c20312d821401fcb93fa1d2098078e6b3eb6e9bc86a7bca732b767553f1130cfedd93b91b8bc516fe72243cc1d SHA512 1d1a33385e9313450a17912440671567c957b74bfe6fea2e11921c8fde30ad5fc54b147b2c9d12763b946eac89e37346e1e5547fe310ee6a8bdb17ca601a09fb
 EBUILD SaltTesting-2015.7.10.ebuild 647 BLAKE2B c26dc3ae5911c67b3df0c9ebfcb961c0864d55f24a398d05bb0c0fbe99bb9ddd2b3abe7ed107c4f864f4c07907dab42c1688d4ac9a45af6b2613415f1e55d72b SHA512 03e3246de4ac6eaf1af587d4c9142c3ae6ee9b89e8791fcacfd2e3ff887d14da682250e27c9f29d614895ccb87c78908f175d59a7fd99b44cfe1f5437686334e
-EBUILD SaltTesting-2017.2.23.ebuild 687 BLAKE2B 6848659735f7461602a2fb88f4a95c02016412c37f6b4aa204ff0c371115c2b4e8788342a003c2bebcb67c65cc63df484599387bf98183cf60fc71d5b26a3f39 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984
 EBUILD SaltTesting-2017.6.1.ebuild 687 BLAKE2B 6848659735f7461602a2fb88f4a95c02016412c37f6b4aa204ff0c371115c2b4e8788342a003c2bebcb67c65cc63df484599387bf98183cf60fc71d5b26a3f39 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984
 MISC metadata.xml 440 BLAKE2B c1e25f228c59fc89508e0a67def40ad27d42f679a8ef63e2a64db91e2c087208ae37d929c28cecff704be813fab5e9365a274e7c33065cf652b9986555a450eb SHA512 66e2e15e61bff62daa00dd1462249b7631b213fb1abd1da2deca72114cd16d296cb7add9eaacad0851a31a9cab01311bb83a8ae09e9741e3b3401b22c054264c
diff --git a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild b/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
deleted file mode 100644
index 8c61110b76c0..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
+++ /dev/null
@@ -1,29 +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 eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest
index e299b970e0b3..48ae99a0224d 100644
--- a/dev-python/aioeventlet/Manifest
+++ b/dev-python/aioeventlet/Manifest
@@ -1,4 +1,3 @@
 DIST aioeventlet-0.5.1.tar.gz 62371 BLAKE2B f9f6ec222649fab7e69694214af424992f19008572ad9639fdaeb480970ea5dd80a55b454dde07fe1fa87a06560e220128b02f7738a0527b6fec23d559807721 SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204
 EBUILD aioeventlet-0.5.1-r1.ebuild 927 BLAKE2B 97e553a68efce31696537bb55fe6ed698c111adcfa6a30306151a429e131347745ea305e07110359d8266b55760360c036d0e9dd13288130a98b040ad7a33ffc SHA512 225460af14ccf66c75fc36d0c038dacfc75776ed6e0348dcb8e98751dbb819da24126491b90b9f77a2141f13b21d395643067868ce5da02aac84f78982bb1491
-EBUILD aioeventlet-0.5.1.ebuild 628 BLAKE2B aed89814739dbed1e087265b9c9b87acf0c275ba7b1a0ccf1ffb42ebef3b80e7fe559a6a398c4804473fd93fd1ad34576afcdfb748193068c00568c71d125208 SHA512 2d6da5b2e581fe304b875a5e6fd9f0a1d0019464b841e39b8d0aaf265d8af258beced65c8301ba468f6851b54195a608054a3959a2b66c76655dba4e7c5c65ea
 MISC metadata.xml 711 BLAKE2B f184bd1795c342943118a94ea27e9746d6c35c8dd7aee97d4315259677ba16cb563795704c16ecbf90093a042bde4db7914a8fe0cb7856ec2ba239521458dee5 SHA512 8d3f849a43a211485e664c422ef5cc290c80bbbdf027fa6c5a551ca1848103acc0b2ae81055f274a88f49c38054708036bc92aa44dd5b8684ed3077647ee3738
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
deleted file mode 100644
index 8aa4acca7073..000000000000
--- a/dev-python/aioeventlet/aioeventlet-0.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=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/eventlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index b06cc666ada3..c12760be625d 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,5 +1,3 @@
-DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
 DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
-EBUILD aiosmtpd-1.0.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 EBUILD aiosmtpd-1.1.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
deleted file mode 100644
index 8595ce17c0db..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.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=( python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="http://aiosmtpd.readthedocs.io/"
-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-python/atpublic[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -r examples
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index eb35df203f38..cdccf24cd8da 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,5 @@
-DIST alembic-0.8.10.tar.gz 976028 BLAKE2B d9309b5ea4be7b42394e1273e3113f9eb1c181806fb21eb414f4b2102e8df25b4f123538c96891d28a9f7d16904b42f6a1980a2f7a93297d170d28dd3448d879 SHA512 28456eb41a2b2d0d870f34cfddf46c25ed01fd1ee99b1a3697e6c0c5369f49245e54db0d7232cc839cf03a5c48efb48a8b967586b3a81ba9462b485b6782a415
 DIST alembic-0.9.3.tar.gz 991744 BLAKE2B 2d18836fee1bd9a57cdc1b8f6159b9c1dc79b82a1bccd8cb62a597dfe47751992929630b9460e430be38bfd43d48cd1981858fa6b924a7283a48c12226867ef5 SHA512 1f39521a1cc9e1e8f8d344f2e48e1f656aed2ffda8e0608b9c5a9a7a1f0e4d16865ae0fba903023512a198afc70e72c683b0ff2bd1bc2e9ba6667009e940a63e
 DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a7981a72aaa95e0d9d53433f52d0695d7e5414dbded1e5d53253a5e2d1cef67b12ed6be58d901859f3eae137486c1 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8
-EBUILD alembic-0.8.10.ebuild 1350 BLAKE2B 23101d6ad1a7da8fa7d7ba90ee1193c03b38337ee2cfcfeb7033f22096496f2409a7767d5b3a1df69f7f815f15dde791e2459c7227cb0fd714404ffb70987a96 SHA512 0f35458bdfa151de6095bcc4e234f7014ff7b11ded3652b3faef410a025167cf3884da59a506435e6cff338d61e3bbed67b6c958adb6ace2771c0a08e5b9bca7
 EBUILD alembic-0.9.3.ebuild 1396 BLAKE2B 93319592ebc29ce633dd7517577c65c94c1046104b41e820a28925f335d964be7f3b8272d0f20c3d8a3c249a7678ed3bff470b437c85bc7e9bc2971d45e3ffaf SHA512 194f68fb4364bf625f414dfee1e3aff268f24f4d2505a0d201ebd466563a5e8a7a86a617a790eb6a369df078c8f7f3d9545978dd5a739aecebc9ff3bf5d6e19b
 EBUILD alembic-0.9.5.ebuild 1398 BLAKE2B 9a935aab7770383adb4e43139bbb2eed13247e44e236c2bd23315a77bcef44c2d48939c5e1eee602460540e3c89083b3670ac9b2ed20f3130d97795f90f7a6af SHA512 52e82d8a19e6112df9ceec510b35c0a7f5c46ba3e1e75d5a1940bc4292be510ec98604be584f50a44dd67d36d771ae9f398dec0b1f1c12ef34e1fcd2660b0b0e
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-0.8.10.ebuild b/dev-python/alembic/alembic-0.8.10.ebuild
deleted file mode 100644
index 0d136584e356..000000000000
--- a/dev-python/alembic/alembic-0.8.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test doc"
-
-# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
-# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
-# and edit to -0.7.3, feel free, and then pick up the pieces.
-RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-# For test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# suite passes all if run from source. The residual fail & error are quite erroneous
-	rm tests/test_script_consumption.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 06142866d6fd..a79832cf14bf 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,6 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
-DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.0.ebuild 746 BLAKE2B f5d0a2b32c78382df027f26a8a9630e0b91d01a97053c733363f792e94a2e7b269e546aecc754cb45ca0bf8e6a7135cb734f5bdcfd90c89a552ba80b31c7f8ca SHA512 2c665d99c5767e12395d4e8f2efd65c5976c1e865d75d475e830cffb467d9be0d84b31004277d0967af57f1ade0bcd828c89087d6e48814ecbdffc9e81357408
 EBUILD appdirs-1.4.3.ebuild 1190 BLAKE2B e4ca960043fec64cc379571e9e9d26f0a56fe3ef893e2af78521116e16b89393d0b0a7d1f63fb2fcfe8e790e06a2b2412aae67c36e0cd10693cd2a54f6f67365 SHA512 8a1526f09c8445277a2bbd3a5819bc558d313ee233eefaca7c3391ee2b5e269b532717bc8a3d8657f5493df148f7766de6e9d886ffb96d45f2e7885d3366f08e
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild
deleted file mode 100644
index 5bee3f5d4868..000000000000
--- a/dev-python/appdirs/appdirs-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# api.doctests is missing in the dist zipfile
-# and the 'internal' doctest does nothing
-RESTRICT=test
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 1ebcee7e5247..eaf98458ad29 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,8 +1,6 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.19.3_p1.zip 678966 BLAKE2B 1726a50024369831fe0ee442676adc4415c7b71e5e12beddd4e09f688aad930bb54664435c569ca728c2dd7b24b4eb46655778c7c35249731f3a83194a40fe6b SHA512 9f9e05c865a19e7b6e6b37e6228027c027ba683be2d5ff7a1767bb3bbeb090bf66879a0eead4fc9e34fc4d84c1edc98137b2839f84ffab9bd36330d05435ab4e
-DIST apsw-3.20.1_p1.zip 680035 BLAKE2B 9a230e87df6a5afeb86828018ef0a026b43893fa694e85410d85753981b7b9c2846d2f1b12c4ff9b3d272727dace42157998ce30a382cc5b125b2824b6a8cae2 SHA512 12284a99efba13abe417a786939e2ab10d677014feb9393e41cc7b127fb974cb961f371c142904bbe48a96038d49605c885fa43739a14ef8e11fb37ea274ce92
 DIST apsw-3.21.0_p1.zip 680827 BLAKE2B 8fceb2d782f3bbaba28f26904ed11281be7e2be351d78c41d39d2941ad45304bd7e62cfbbc9134e21b1ffad4f7b7d1373a2866d6cbb61345c263502b23fb018a SHA512 c2009d243765532e27220478d1164f97201afbd2b1de1e4090b4f35b63c83d0a82d2bdfe14c6625858867633995d3d8eef91f17ecbbd915f99e5a4a4edfa7b61
 EBUILD apsw-3.19.3_p1.ebuild 1055 BLAKE2B 0051a9e6f3ac8a4e9a082ba67519120ab53b2b436fff94294eaa4aad1316c1a854186c0d36e596e48902a7f5fc84ec986c1761dbe05d2ec5599ef8563bd77b1c SHA512 f8a332998543699139d5ca8357f5cb9c7ea5ea7c07dddb142058a906bb28005f451136cb8c7774bf47ba4bd7c8e76091e35843206f53434632cf0ba275f615ef
-EBUILD apsw-3.20.1_p1.ebuild 1057 BLAKE2B e175826406da5d6fdef7b3122dffff395be9a5aa4c994e21509731e55d0895fac19a462fcaf6ade0815bf939a889c54e478732f3d5854d412e8cde02c87dc16f SHA512 f818ef35546e3d46a2f42f0506cedb4d3aedcdca46a151a56cc8b68ee8958cbfdd82a874c78bb1a8d79db144d85509602009985c2367fcd1df64c2c6cdce2b53
 EBUILD apsw-3.21.0_p1.ebuild 1057 BLAKE2B e175826406da5d6fdef7b3122dffff395be9a5aa4c994e21509731e55d0895fac19a462fcaf6ade0815bf939a889c54e478732f3d5854d412e8cde02c87dc16f SHA512 f818ef35546e3d46a2f42f0506cedb4d3aedcdca46a151a56cc8b68ee8958cbfdd82a874c78bb1a8d79db144d85509602009985c2367fcd1df64c2c6cdce2b53
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.20.1_p1.ebuild b/dev-python/apsw/apsw-3.20.1_p1.ebuild
deleted file mode 100644
index f2bb6b9990b9..000000000000
--- a/dev-python/apsw/apsw-3.20.1_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 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 flag-o-matic
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_compile() {
-	python_is_python3 || append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index a69f92732558..5dcd7fdee0c3 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,10 +1,5 @@
-AUX argcomplete-1.8.2-disable-tcsh-tests.patch 1294 BLAKE2B a36d8120aeb77a65e15bac4182baeee2870d404759c340248f4c5e47685378c83b7faabd6dfd02c5185f97767baf32ba6fd81bfda581b3408075835ea22158bb SHA512 44c61d79dd23eac102fc437d9778f56d0a44b24af228b20fb2958d28962919718cb9a401a42f8a688eed655da85571b777136c4e5ea7d34f6634aa5381287b3e
 DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
-DIST argcomplete-1.6.0.tar.gz 39685 BLAKE2B 0055394ff7481cdce2e6882f971fab35ad3df972238915d51caae68c9b8ff36e8510a0cb57c01a398bcc56b8a14b2bb867eb4b9099bab00d67ef6f5dc6ceaeda SHA512 6a2a6a4af3ddb5bea0022bf5e2acb123d4c0505d979887ebb82ed5c8a591d59d35b57084483428d030e0507f3cd149953146f49d4a7b0290bc88648cea3eb7a3
-DIST argcomplete-1.8.2.tar.gz 53626 BLAKE2B 446fc108468ca10f63f23e00aa891c7c692345f71274d798f046644f5c203017553d071b0e3cd643d4e786f5ef2502d9bd35d940692cf814f96727c73cee3f9c SHA512 ed3ddfe402bd89b81da1935a105dcc1914e9c7b98590624ba1140647ce1322a71d790bf3d0e29fe745ca676aa22f99b9834b58a97c2b1c08ca4a32bab7f4c914
 DIST argcomplete-1.9.2.tar.gz 46445 BLAKE2B a515fb1fdb94a78f02d01c90950bc21ac8000ccd54724e3037fb491097627a0f5de08b281dc13a7b531b4df6598f1aa1d7310932131a5a5a778dc5e5b39020d0 SHA512 174a4f7f1e24944472567c7cf2959b1bf1bf1d57f9c9d36469837f568d9e5db89d7055a2b93ff58e72fa5a78acb498833833a465da2b69bcf09fcfa2ecdad742
 EBUILD argcomplete-1.4.1.ebuild 969 BLAKE2B 5c0508ce8b9ee5761875d02c77952aea8a3be4d1848102e765686dfa4fd67323b90be02a166abe7c9cdd5f2e6e9404475317e0d6f2e5d03e1ac239d0eb035fe8 SHA512 0318d5717d2586a1090e660a8efc46a56066046e85862e022bf69c22fb7a4ba0acd9da58d51ea75fc38f3d4ae982698257967777c8324acc4ab97c0191b473a2
-EBUILD argcomplete-1.6.0.ebuild 753 BLAKE2B 1835e169dd140d15262da1376a7501c079d4a2ae568a886cc09af5fb5c8412f0e258fa7c6dac9da673533e119944f938c1c626b5743ce1b465864d882169d149 SHA512 d2b6de83703f36e1a98611610b132eee793f684f3b0826530c9319e1b11503c9991efbee673145a3bb78478b225f56b57fda5adeac76a6ab5e9f7ba71f0f1f4b
-EBUILD argcomplete-1.8.2.ebuild 812 BLAKE2B c82de5f05b20f1746aec62690b88e73981a4c5ab35eea112b168217eeb9c3aad133dc328f3f9f02f54ea49e72bc6c4f5fabd0d25e93e760189aa9edfdf29c1bc SHA512 2f9f68b9f6241c71cd4932613b8441ba5c4520ddbebe20163de962489bc985349914b90af3a7245cdd225d9777e9af4246af3f0fa8af0a2b8bbedf5c407ebcba
 EBUILD argcomplete-1.9.2.ebuild 773 BLAKE2B 8cb9f6f6c57de882ab9eed0af27b344b97cca10752ec4a0d728c18660c80cebb8e0f725119b724b783de233e17074bb8bd41c0d75ed32bca61688a028e5d5f44 SHA512 15eaee33df92399e24ec42b504735f577f0336780a1ffac591f04b8b5a083a58774dc530c77404113e87fe81de4c28671aca2cd73358c4d84fa73c7d6dc8a78c
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.6.0.ebuild b/dev-python/argcomplete/argcomplete-1.6.0.ebuild
deleted file mode 100644
index 259a9c1101cd..000000000000
--- a/dev-python/argcomplete/argcomplete-1.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" test/test.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
-}
diff --git a/dev-python/argcomplete/argcomplete-1.8.2.ebuild b/dev-python/argcomplete/argcomplete-1.8.2.ebuild
deleted file mode 100644
index 6ed17da9c813..000000000000
--- a/dev-python/argcomplete/argcomplete-1.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-disable-tcsh-tests.patch" )
-
-python_test() {
-	"${EPYTHON}" test/test.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
-}
diff --git a/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch b/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch
deleted file mode 100644
index ee866c39d117..000000000000
--- a/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/test/test.py	2017-07-10 21:18:13.701472836 +0000
-+++ b/test/test.py	2017-07-10 21:18:44.021473430 +0000
-@@ -1041,32 +1041,6 @@
-             self.assertEqual(self.sh.run_command('python ./prog basic f\t'), 'foo\r\n')
- 
- 
--class TestTcsh(_TestSh, unittest.TestCase):
--    expected_failures = [
--        'test_unquoted_space',
--        'test_quoted_space',
--        'test_continuation',
--        'test_parse_special_characters',
--        'test_parse_special_characters_dollar',
--    ]
--
--    def setUp(self):
--        sh = Shell('tcsh')
--        path = ' '.join([os.path.join(BASE_DIR, 'scripts'), TEST_DIR, '$path'])
--        sh.run_command('set path = ({0})'.format(path))
--        sh.run_command('setenv PYTHONPATH {0}'.format(BASE_DIR))
--        output = sh.run_command('eval `register-python-argcomplete --shell tcsh prog`')
--        self.assertEqual(output, '')
--        self.sh = sh
--
--    def tearDown(self):
--        # The shell wrapper is fragile; exactly which exception is raised
--        # differs depending on environment.
--        with self.assertRaises((pexpect.EOF, OSError)):
--            self.sh.run_command('exit')
--            self.sh.run_command('')
--
--
- class Shell(object):
-     def __init__(self, shell):
-         self.child = pexpect.spawn(shell, encoding='utf-8')
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 789ae47eb739..ba18c7520f1f 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,11 +1,5 @@
-DIST astroid-1.3.8.tar.gz 155302 BLAKE2B 2fd85e9b34c1d6ba06b1028690be0b598d5fa6d83782a397e6b6f2895c37bc7f35ca080612bc0533f312bae2e9e6d211cc6329c74df4ff59b903bc4e8775118d SHA512 316d3a6a12d95b3bebe7ffe47de840cbff96f357c7c324f6684bb713bca191cfaf87fe226c3c1145049611a2035890bdf11845bf923f7d0087a0d1e565d5d5c5
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
-DIST astroid-1.4.9.tar.gz 189315 BLAKE2B 418c34ec0eaefa94b562288f9a4da07f020abca8244d1ebf1cfb16286e941fec805c4140cf993b3744b6039bbdda5546e861be5153a8c6be30597cf85edfb7db SHA512 9091afbeffeae3f10a5f4b0dfb476ed5515661744508dde159bb3faa4af032c6359f4544cc3766a6613974f7725e6f8e28bad45bc68e3282764def019a233303
-DIST astroid-1.5.2.tar.gz 240007 BLAKE2B 3e4b40a9da4ca3b63fc83e9419d31bb924446f22acbf4ce60bc191f3c6554536b6188ec928de9f6264c0a481334c20ecaf690ee411ae0bc924f5a4bbbf2a4905 SHA512 e8e4facc34f7a5ca1128961c3134d3adb0e59437aa38ef567bfe777b94215fedc32ae524135c6d376a3bc648c851d59315f4caadac684d7576e582e5d9e3b2fe
 DIST astroid-1.5.3.tar.gz 240617 BLAKE2B 06b040fa83327a38ea23e4b09c4ae978b5953ac99a7fec4b7fabb8982e8bb8da3e2f4781654159aec9989b4c99a119e1116622fa75bd4cac63d6a5c8b34bbf31 SHA512 2a224d9bf8e41059a1316d80738cdc0f1e4c4e0f987baf3969710bae7192466b708c7942cd7e4eeccea55582ce70bb687c96b9e7dece3229ae4cffc558aa2319
-EBUILD astroid-1.3.8.ebuild 1073 BLAKE2B 1ae6b1e4fbcccda6ee742986774894a6eab760dadb8b9dba0c8bd9e32a1eb58979fb54c5d618b8adee8ea6a59048cea70d4300e4115cb5f36ae896661cf812d2 SHA512 149f2808e81d785545f3397f064e02af6bc0d94964f8de1ef241a9645ed539d1ad1593edbb13ea5b6c82c95ac7efe1ccde29cd3d36494fe9a750b267e25bdff1
 EBUILD astroid-1.4.8.ebuild 1096 BLAKE2B 8cc82d7263e7cc798609783f06f5255094dbd7712ee23441f975022282bc2eb0b9fe88ab727132b6f9689af2c530c60c480cdbd9cbf4f88f8005aaf692374565 SHA512 149b74ed93283dd9ace74311b313e93ad200e08c5056135c69da7117770361e7f0d958d309c482e8ef580665d4fc4c0ca41113deaabdd119c1df33904ce471b4
-EBUILD astroid-1.4.9.ebuild 1220 BLAKE2B c92499a0317e7fee1617f1acb0a7b7c74d94a57ea6f4709bafbddeadd0c5cceb2602eee1629abc87b830ad81aa2c9c33bd512ffef43fb5185bda6484087dc45b SHA512 db99782868dfac9a4af91f5dfef17091f7e9a1c42ce1f2495f2a3ca1bf0b6f1bba0b82ea0c70d97e2d6d29bf54f1198c31158f4b47f1ba0a95d0978aab5c9539
-EBUILD astroid-1.5.2-r1.ebuild 1642 BLAKE2B 009f75f4677d0e6088025841fd47194abd512e6356d05f601fbf0f98839bb04facb036883bf27293a67daf4a8d9cccdb1e8e7c9c68571e17509247d451ee5fc6 SHA512 7508cb4682695048538ea7e267fd986f6559d9063791c3543a0daeb44c2469ef1896bc52f5685742c8d5d4e4d8b608302f2598f57d0ccabb19582766fede03ae
 EBUILD astroid-1.5.3.ebuild 1662 BLAKE2B 9894a6a51d2d91b9474039af442049bc4863c3c41231eeec55da02741c6602d366a769c051c22a10c7b6a32dacfaeca2bd803e01df8b4b1c22db2ddd69996ba5 SHA512 0b6b2716cce18d524a1b5a656246ef5e0f83e451ea3e1f21a649392bcc7aa9e45e005b0e3a733a40844afa7d299507b4fdf3b99f0cd52cf2fc133b346699d4f0
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.3.8.ebuild b/dev-python/astroid/astroid-1.3.8.ebuild
deleted file mode 100644
index e8fc068acbd7..000000000000
--- a/dev-python/astroid/astroid-1.3.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/logilab-common-0.63.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-	)"
-# Required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	pushd build/lib > /dev/null || die
-	PYTHONPATH=. pytest || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/astroid/astroid-1.4.9.ebuild b/dev-python/astroid/astroid-1.4.9.ebuild
deleted file mode 100644
index d79526270f5a..000000000000
--- a/dev-python/astroid/astroid-1.4.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pylint-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		virtual/python-singledispatch[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7 )
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 )
-	)"
-# Required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/astroid/astroid-1.5.2-r1.ebuild b/dev-python/astroid/astroid-1.5.2-r1.ebuild
deleted file mode 100644
index 971e558cca36..000000000000
--- a/dev-python/astroid/astroid-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
-		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable failing tests
-	# TODO: investigate if it's our fault and how can we fix it
-	sed -i -e "s/test_namespace_package_pth_support/_&/" \
-		astroid/tests/unittest_manager.py || die
-	# we hack xml module, so it does not match what they expect...
-	sed -i -e "s/test_module_model/_&/" \
-		astroid/tests/unittest_object_model.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 612489eb5bf4..3decd54166f6 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,3 @@
-DIST authres-0.701.tar.gz 18878 BLAKE2B 27dbf9aea7047a2c1746e4aea1b948128a13cea8d3107b48701b122f2b4a2d4702098e3d7405e3371580da5b2f05dc574ca82b43c4404ea3add5fca6a7d77b5f SHA512 e4482a8c5494a550a76a0d0b8b0d406d257da271d8fae901569a960d2f90ec616c5de48a578240e831c29f9345d128ecc9cba6f05befbb03f5cd90b4c26af422
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
-EBUILD authres-0.701.ebuild 602 BLAKE2B 6fff2759b45ac6dc19ce7e077afb96a551790d67dafd3a30b2a9f95e520ea361676db5353d208f63b76f3f5cbf8c857429801af5bc3202c720a68aad2555ab7f SHA512 ff79dd071fb0ab48f970d8d7f6c052111e9805083b244fa55188c4cb3350e05313d6edaa3f8eb47245c6364888958e1e194a5cbc94c11bf2bc415a92453f7f92
 EBUILD authres-0.800.ebuild 611 BLAKE2B ef0bbff067ba7494883787236c2dbb54de6fee50adbbc343312fe0a5e9de4f64c5251fada05534ef72a466664d7142890ebe09058fb662ab610b255152d5e575 SHA512 9d499251c91245a5461166b6fa91c7e7bc466777e642c9a112c2a9339a6ff5fb7791526f107b936ccb6b39c1a2c79bea5e5e631ced1a5d93710b24c333fee10a
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-0.701.ebuild b/dev-python/authres/authres-0.701.ebuild
deleted file mode 100644
index 36c972c7dc80..000000000000
--- a/dev-python/authres/authres-0.701.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Authentication Results Header Module"
-HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.python.org/pypi/authres"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-DOCS=( CHANGES README )
-
-python_test() {
-	"${PYTHON}" -c "import sys, ${PN}, doctest; f, t = doctest.testfile('${PN}/tests'); \
-		sys.exit(bool(f))" || return
-}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index a80a0bc4053c..a6f731ce6411 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,13 +1,9 @@
-DIST autobahn-0.16.0.tar.gz 185053 BLAKE2B 6d23c0cfa075c9e447ace95be1bb3e2c1f0c02384069b8dc63f93f13913a5e11b0551ff069afab42ad096d003b222a6151abd3c15a3e63685f1903c732ffcc13 SHA512 8873202a33c7b68577e89cc91503b8002aa19638836ff39ef99022e3b0ddcfb613154ddf0c373bf315eeb8b6c36f31afc20eb0164c47caa087b2a1b28449d3a8
 DIST autobahn-0.9.4-2.zip 175894 BLAKE2B 6b1ffea7d77968e4e4787b321c12434821fef6c6f4c84cb2bf9bfa2fdb9ff3438080609b825f976671a2cad16203be9efc0f7fe70ce7f5bef96576c1ced02b7c SHA512 7e0d4246b8b1c552b25c2ae36f1923ed9931e3d3ca684039a422773fecd92ca04734a0b24394a9bbc787f245c72b5552522351a7c1c8e500128e7c46c740a3d5
 DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382
-DIST autobahn-17.7.1.tar.gz 211238 BLAKE2B 9db0736283d976e4ef721a511eec47b630a739e593d6cdc1bd3db0f18b0339625779bcf183426c3b154b67615d9437cfa7d75fa295927309d7e022a0646d1cc6 SHA512 592c4e21a7986fc9ac992fdfd24055654c5db7a3b8963fb5814bc32bdfbcdd7e3271bc84ed35faaf50755022a115a5f026de825ba5c35dacad4cfa2cf776d50f
 DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86
 DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f
-EBUILD autobahn-0.16.0-r1.ebuild 3808 BLAKE2B 982356b9cea850ec1048100cfa9fba9fd8c2940702eba69a35b7f3f90db9b8c81bc75c1ce8b64e2996047d7f6f1b07bb86570ff5971e88d7f20d7717967e0e5e SHA512 a433ad1e8e5746b355a1a3728440d0e0e32fe549979ec6dcda1133c8878dbfa3c73c09ebc07c9524b56ad84de9977b48937e9e69f0fd8dbcc21d4bbbcc7a4c06
 EBUILD autobahn-0.9.4.2.ebuild 2928 BLAKE2B 26e0e26b7aba71c25bedced1bb63ad8425ed86384ac08e6f9b8ad96a75bd1c6845da68b41dc26690853fe09d2af212c97925596f1704abe974712db25b866767 SHA512 2b0d5897dbb3e659e2c02a9267cfc8847c636d5898ba59ea33786d1ead74b2a0d62a51e869c08e913c00c08694dc15ec4ce0b9a473ce1855de4da9a0a85035f6
 EBUILD autobahn-17.5.1-r2.ebuild 1855 BLAKE2B d15732d36a5f8c7d8620a4192f301cf07f92e257b70d0ba228de8bf459ad15ee1892c1c610cd52d22c801c3192903e6708a89432c99d6248d9dc4ebd919752de SHA512 370231757473b8bca2df5598e8d741b52dc4f20268eb1497da7e96073519a6d92890aaaedd822741deffb2b562cea8e5c766a41d80d51b350e9edc5655427ccc
-EBUILD autobahn-17.7.1.ebuild 1862 BLAKE2B bbbccc4275e406e945348dc48a6c7d2f13af10bc2b1661b82a09ae08c95aeaac561136736630649e7e6a27b353a43ee552516f79392faea9db7ca97c5a8f318c SHA512 3edfab0daa669f4b4e4b83a771a841b495fd9d76f2ad7b5699c338aac59b1456656eb59025381961833193e24ae2451821ef188d28c4ec010a44ca6efbae5a68
 EBUILD autobahn-17.9.1.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191
 EBUILD autobahn-17.9.2.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-0.16.0-r1.ebuild b/dev-python/autobahn/autobahn-0.16.0-r1.ebuild
deleted file mode 100644
index e33d8c71c8ae..000000000000
--- a/dev-python/autobahn/autobahn-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,131 +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 )
-
-inherit distutils-r1 versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '>=dev-python/asyncio-3.4.3[${PYTHON_USEDEP}]' 'python3_3')
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-core-12.1[$(python_gen_usedep 'python2*')]
-	)
-	>=dev-python/txaio-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-# TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE is now
-# set in make.defaults. so update the plugin cache
-
-# copy of the twisted-r1 eclass cache update functions
-# for the older split twisted releases
-
-# @ECLASS-VARIABLE: TWISTED_PLUGINS
-# @DESCRIPTION:
-# An array of Twisted plugins, whose cache is regenerated
-# in pkg_postinst() and pkg_postrm() phases.
-#
-# If no plugins are installed, set to empty array.
-declare -p TWISTED_PLUGINS &>/dev/null || TWISTED_PLUGINS=( twisted.plugins )
-
-# @FUNCTION: _twisted-r1_create_caches
-# @USAGE: <packages>...
-# @DESCRIPTION:
-# Create dropin.cache for plugins in specified packages. The packages
-# are to be listed in standard dotted Python syntax.
-_twisted-r1_create_caches() {
-	# http://twistedmatrix.com/documents/current/core/howto/plugin.html
-	"${PYTHON}" -c \
-"import sys
-sys.path.insert(0, '${ROOT}$(python_get_sitedir)')
-
-fail = False
-
-try:
-	from twisted.plugin import getPlugins, IPlugin
-except ImportError as e:
-	if '${EBUILD_PHASE}' == 'postinst':
-		raise
-else:
-	for module in sys.argv[1:]:
-		try:
-			__import__(module, globals())
-		except ImportError as e:
-			if '${EBUILD_PHASE}' == 'postinst':
-				raise
-		else:
-			list(getPlugins(IPlugin, sys.modules[module]))
-" \
-		"${@}" || die "twisted plugin cache update failed"
-}
-
-# @FUNCTION: twisted-r1_update_plugin_cache
-# @DESCRIPTION:
-# Update and clean up plugin caches for packages listed
-# in TWISTED_PLUGINS.
-twisted-r1_update_plugin_cache() {
-	[[ ${TWISTED_PLUGINS[@]} ]] || return
-
-	local subdirs=( "${TWISTED_PLUGINS[@]//.//}" )
-	local paths=( "${subdirs[@]/#/${ROOT}$(python_get_sitedir)/}" )
-	local caches=( "${paths[@]/%//dropin.cache}" )
-
-	# First, delete existing (possibly stray) caches.
-	rm -f "${caches[@]}" || die
-
-	# Now, let's see which ones we can regenerate.
-	_twisted-r1_create_caches "${TWISTED_PLUGINS[@]}"
-
-	# Finally, drop empty parent directories.
-	rmdir -p "${paths[@]}" 2>/dev/null
-}
-
-pkg_postinst() {
-	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
-}
-
-pkg_postrm() {
-	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
-}
diff --git a/dev-python/autobahn/autobahn-17.7.1.ebuild b/dev-python/autobahn/autobahn-17.7.1.ebuild
deleted file mode 100644
index 886abb73a070..000000000000
--- a/dev-python/autobahn/autobahn-17.7.1.ebuild
+++ /dev/null
@@ -1,65 +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 versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="crypt test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-16.0.0
-	)
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	#esetup.py test
-	cd "${BUILD_DIR}"/lib || die
-	py.test -v || die
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index f0e66af3680c..a541fed00ce7 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,9 +1,5 @@
-DIST bcrypt-3.1.1.tar.gz 40103 BLAKE2B b67827cbdd9d34b9adc618617579ac9f57959659a8ecc5b720b5f06a9659a23a88c61d578b834bda2906112ab87597f07bf22a209c33b4d4d4fb4519b7d73f52 SHA512 1fe7408262cdbe8d9f4f6f1e13e44688bd459aac98a2b73b491e9d8194109cbe0fe05a2fbec62b8d483985f59cd955c186be071675038d51ffea5c14a4452367
-DIST bcrypt-3.1.2.tar.gz 40365 BLAKE2B b92a455ab5fbfac67cf6ed5806061e91c009910860ab18c5eaf08e514b4a275a93278680d3f1ee80f748e8d572c2ae9c0f849a332fb403a71e53e38bf48e632d SHA512 bab4fb2ef44f7a8c64f2f71832c52840ad64630af58c4d5019b4679123eb17421eecdd75ff1df108d3789ca12e68c07ea9fe9acdc76b909f01de1de924645c58
 DIST bcrypt-3.1.3.tar.gz 40806 BLAKE2B 60b42bd4326ae1285911a79eff43f871366d6db8f1c2eb102f4f4cd3e91d29e58d30906b542d6f04ec0608dd5583550c0c9ddb795d8fd05cd1802396535ba59b SHA512 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c
 DIST bcrypt-3.1.4.tar.gz 42575 BLAKE2B c4521ecfa55e5b857e35c9d9e402b8e911b2546bdb349a4e87f31e6af0a2686ebc9df4fc6268534c65d3bca8facfa2e8ccd549174f8f91a25002e94ba7fb9be4 SHA512 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
-EBUILD bcrypt-3.1.1.ebuild 903 BLAKE2B 79ade1ec5e091e545b4e79ee7cea009b64faf22e86e6d08561369560d6a268e32aab671fe17bf36bfab0d62ec1b9b801d121a70145db997e3c3ac0d0d3007436 SHA512 413898097ff85b779de4c24ddcdb10f000a8c254c425b5524b8d2ac4b576b55827d6d27b88cdaa4bd77317af8e444127bfd301e9fd29814dcbe4d3c71fe13e8c
-EBUILD bcrypt-3.1.2.ebuild 915 BLAKE2B 3255a42f95ca45bf6f16e50251d742582ed04450038485712a18d2283d9501ca5314f436479a5c27b628c0278ae3789995ba4b0f3ba39b95b8d4e54f4c2b37f3 SHA512 b91f2ea8bdbd9f8ba8ac8e616e5ce828cc7e562350015b1643fc29cd14536eb7b4fb188df2f2a3d30b97aed3af0db80b04aebdec4d4f66eabf00826451d2dc7b
 EBUILD bcrypt-3.1.3.ebuild 873 BLAKE2B b370a6d7275e65ca8b14ce5163676508fafb65b0f77a5b3fa3e246481fa1c66880e12f67fa6bc1f181b0e6a852df8accf5047c27b4b3b5290cee6d51703348bf SHA512 2413283af8e9f093fa50a770f3c541120f9e6598371e219f7c59a0114d9d3fa8c9bfec22292f1919d6230e2a667375bda7c20dffbe6ec504fc3c7f473e330064
 EBUILD bcrypt-3.1.4.ebuild 879 BLAKE2B e70f2438319b9e95fea6d48450d437664f41e85087f1bac51de82000a4ee8b46c2615193a3773af500e1602578a030782d520bfcca152c4c632facabdc226522 SHA512 879def966adf93a79eb12bcd32e5d79e1322b97d94a62722a16097c020e72ff483552f902e776cfb7ac634b9fcf45559a0d057d787a0ac2a74311574a351c599
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.1.ebuild b/dev-python/bcrypt/bcrypt-3.1.1.ebuild
deleted file mode 100644
index dae3fb0df199..000000000000
--- a/dev-python/bcrypt/bcrypt-3.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	!dev-python/py-bcrypt"
-
-# The testsuite is not included in the tarball
diff --git a/dev-python/bcrypt/bcrypt-3.1.2.ebuild b/dev-python/bcrypt/bcrypt-3.1.2.ebuild
deleted file mode 100644
index 0a89678c1348..000000000000
--- a/dev-python/bcrypt/bcrypt-3.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	!dev-python/py-bcrypt"
-
-# The testsuite is not included in the tarball
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index bace3d0a1639..e7bdee3b1758 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,7 +1,5 @@
 DIST Beaker-1.6.4.tar.gz 54480 BLAKE2B 809b2d23fb95a21ab442b3be20ff5372630697baaf507fd26d8aefabeed422401de890c8de165a079bde4a05230cea244a8d5bf31b8b89e60a88b840de9cdedf SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704
-DIST beaker-1.8.0.tar.gz 77211 BLAKE2B b7665cf2b70ca81d568ea3ca1ac2d80427d24e000f9f4888e498f7a148cb4525fc45f6c63b8e3c5e8f5ab88405f8838b9ea5d978350c2c0cbd635d1760ad0b73 SHA512 5018b96058a6dc892350eb1fea0e1a44f872616444049e38a19f302b7e39a4710ecf3ddcc62361213f2663d3ecfa72823ce431f29f837e4a49ec556cf69fd88f
 DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
 EBUILD beaker-1.6.4-r1.ebuild 1229 BLAKE2B c32c75cefde9ebfbb6e418d7d828d873b80eb18f5ced6af810974e757b733c64bdb51bbd230054b47e343746138156c15fba6de7bc77afe889c3652765dcbc0c SHA512 6d242a75d4807003321ec17adfc3cb647e1f4c1b40576cf0546a6c175275c383fa25966205e77bd34163b66a146a1a099da969a21ab0ecb16c3927e6d337097e
-EBUILD beaker-1.8.0-r1.ebuild 1078 BLAKE2B 37fb6bbe9aed6038c6ea17a954b25fae3764eab7982ff83d86c238b4e00aee3b5510d8340b6e19ab995cc3cd2bea0413a013c6632a61100c0d935cb9e907d918 SHA512 7c8b8760a1f76a6182612a45c2f71f531748441d45b59db4b5243b29fac81e78e03afa47dfb9a5a70aa110aff127868eccd1bfc8e046f737f667ccfc3c888829
 EBUILD beaker-1.8.1.ebuild 1305 BLAKE2B aaccc117b57166036f01a78347f491eaf3007ef579d568fec97a82535334194abc9a4da6853728f7812d5f5b4e1ab7c6df7eac18272236b802fee1fe6dd1dba1 SHA512 15298245549fa0a9a20034a8080fbfce30fe147df68ec8ed720ff6085d9c4f1218fdbe00b6ad14a30563730bc8c8f75c4190d850151416d2afd585ca1c0fb410
 MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.8.0-r1.ebuild b/dev-python/beaker/beaker-1.8.0-r1.ebuild
deleted file mode 100644
index 76ad4a3b3b75..000000000000
--- a/dev-python/beaker/beaker-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,39 +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}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="virtual/python-funcsigs[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "beaker also has optional support for packages"
-	elog "pycrypto and pycryptopp"
-}
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index e31b7a674e75..47e0c19574f1 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,9 +1,7 @@
 DIST BeautifulSoup-3.2.1.tar.gz 31224 BLAKE2B 9361ce6d048d0443c3257d10ec2734c24202af8eb850a59a4344e6992856f849d92dd509f102c27cdf9634bbc235e5f96e304993e6d4813d275d66bd3791b451 SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789
 DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332ca28cc4b5ff80b90c326d80ef55acef8e98d86691a7b1df420bf68bc65e96ad7d559b461a03f44e494fb4b7789753601 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f
-DIST beautifulsoup4-4.5.3.tar.gz 159185 BLAKE2B 8319869698aa4767ccc3e8b4f57ab17bd6eded30c408fe5a450be53ba0c4c555079bdfdd2254927895b09b0b01428fc0feb8b18fbd0c033a90749b3362e6c8b8 SHA512 d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84
 DIST beautifulsoup4-4.6.0.tar.gz 160846 BLAKE2B c56c61c5ac2116721815b3cc8e0ec249f191a76bc36e26593af54cc0937e3a4d70c5a2b3069b12f1ae4f5b78cda78e2abda5da99fdd6987afe0f581a4130685c SHA512 1a7eee4218e58cc3852e71fe4f0892f673bb46a851941264766a38eff8ef05d612d88b4641fcb478ce8f66ac50dc987ca039923c4bbb11867c74813289f7e578
 EBUILD beautifulsoup-3.2.1-r1.ebuild 859 BLAKE2B 70c87bec409073dd0b6692fe42b09be4e08c4bfea43181c67a23fa3655607f780501768e6aca56b18483bb005465605dfe2ed8b1c7cf13adef32cc90bd2f3769 SHA512 aa3b7d3bd0161f7ea00bdedf48160023513686461012b93e62d635183e668271d7b6e3f275d2f6a368f74abb741494c58978a00c6884df65ebc791006065d2dc
 EBUILD beautifulsoup-4.5.1.ebuild 1362 BLAKE2B 23f7dbfa0813a7d0d9f4c61d00963f77f0699c2eaf975ecf80240d5d900c1a14e6f9e3c6186234629b16851b4e40d209a52e73bced946f13e55bbb42781f27b6 SHA512 78b6092f6806324b91fe73a554bdc94ec258d8ce461331b276864ab99492b78eaef07e745a90b9f1400c34028a28ce206d2ec57f8d3f295b951541affd4b2114
-EBUILD beautifulsoup-4.5.3.ebuild 1371 BLAKE2B d465ced883db433ac550bba1a45a02500c4e1a9342ae72b7c1d26065c7cbe2fb66fe8cecf117e8a9579cf64ab78d11d0bc899ede2ac04c4ef829001f1f775d35 SHA512 e637971890f68ce4f485be1c4e3fb7bc10812080b427e9c929e5f02208606e754c70b024f00b98cf2efe854c11554b60a0a3f03930996a87d722649361965053
 EBUILD beautifulsoup-4.6.0.ebuild 1327 BLAKE2B c4a4bfbb9085b731232fcc713bfe5e421157cae46ee740f86e7b6af1fd46bafc67f46b70d659d0a175b571e534a30a2f1e527b09cda2e77a27f17a7a19f731e2 SHA512 e7a259c6a3ffc73f4e7bfab7eb44bf44b05011bc1de15ba5d86a3bff2aa630fa5d45a789421800028c035d7298ca80b9c416a606c0a4611740210de61d3fb385
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild
deleted file mode 100644
index 82ee5a047f3e..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
-	https://pypi.python.org/pypi/beautifulsoup4"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 665138f90da3..fd11d8bca586 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,5 +1,3 @@
-DIST binaryornot-0.4.1.tar.gz 372095 BLAKE2B 9f37b929941d610e5a114747f765ed859f78839a4734b4859b39ebc4821fbdb6b69ef19405a4bc607c94d68f8ae54672a9b03bf87afe8ebc463f421f92b07113 SHA512 49732b725e7adc58fccc591c56bf4df65d1adaf3e5ce98e9f0a8aa2164e0f9bffcbcd6e793ae2cfc1ed90a5d74fb5899ec99de1b15bd3878a15c33f283319a45
 DIST binaryornot-0.4.3.tar.gz 372299 BLAKE2B c4ae99b9ccb66da8925d74fad68b8df4713822acc74d852e2f584e5c157eb465bc6418b0e0085533479ba1ee937c3d2716dea66ce3bd517d49a490ab4615f694 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa
-EBUILD binaryornot-0.4.1.ebuild 673 BLAKE2B 510a53d19d3713504113465d85a735af3b6ed247f11b166289238f3dac177bfb7e3111f5d4d35f79492e50d8315bd176cb2fbd7444946a9f9351be2ac8f5a9aa SHA512 bb1f3d5d378559bad56e5884e87fb1f2090aa8afe4bbc5d8e2e720a4b58b970bf51d3252f7d8e8c3df44e279d34e09edf2e8ad122a2b9575b570f07a9436d1d6
 EBUILD binaryornot-0.4.3.ebuild 677 BLAKE2B 19e3034852fd5cc3271a79523ae83ded3107602f3840a236f3b8ad7c056dd7589e7a4ef12892f5e6fd102614218ef4072fcdf04d4d0fe95e8a4b6833188fcb09 SHA512 89231391bc20744b9409098dc27e94d95d41c42c620241713a9b86b21869d9cef758e04557833376e9dc663b59f2bacd2ec52e8f3d63baa4df51831a79bae253
 MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
diff --git a/dev-python/binaryornot/binaryornot-0.4.1.ebuild b/dev-python/binaryornot/binaryornot-0.4.1.ebuild
deleted file mode 100644
index c9713e935782..000000000000
--- a/dev-python/binaryornot/binaryornot-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
-HOMEPAGE="https://github.com/audreyr/binaryornot"
-SRC_URI="https://github.com/audreyr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
index 04ef966bc562..b17f51912cdf 100644
--- a/dev-python/blaze/Manifest
+++ b/dev-python/blaze/Manifest
@@ -1,7 +1,5 @@
 DIST blaze-0.10.2.tar.gz 9681767 BLAKE2B 9972d0f9bb00ce462f20673e9e164d504bc1157730bcb36a42b53ed1523a73bde36a1858ba7df1f813c126291251c6170da8ac70aaaac8932206de5f3e063a10 SHA512 01b7c5563f928c336f13eb13c6397f1089bca7c1cf0824da672acdabf28b18356c52678c58b2fa7af303601c6013e9d6f4fe26359ee6ab9a01f8b735c7d24a56
-DIST blaze-0.11.2.tar.gz 9687465 BLAKE2B 1b853a4b2b98152c3d3248988fc99a31138e7bec08580c394f92e41931de2d3f9f57bb082ce2f4ef9aac869873cd15f86163229b2af576294a2baa2d7a01a5b5 SHA512 aa4e6a06ed8456d73f98bd2a06c236f9a7cc212ce23d53f9212331045e904faa1ecd7998111a7f58b4d76c3c0cb72a0904f829d6dd729f43e91a284b0f3f9819
 DIST blaze-0.11.3.tar.gz 9691443 BLAKE2B 13734e3b2f63ad044991644a4c8243b449c5179a80efdaa5faf6ecf443434bec7a00953f0f17d73885b9e9fa506e72a9bc369380d2d7a561f5da064d8339e03f SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f
 EBUILD blaze-0.10.2.ebuild 3169 BLAKE2B 251c9d778c6a20502395e5eba9d9269a3adfb3a7adc532ae0e41f8c5ec0495fdf9f61dab81de53967d62f80ebaf139e25dcabcb03175a432faeb32ca89454157 SHA512 53c7041857c51de3cc55485f4a235f92c44320ac1c802fa37b6bd716ff0a2e5e275d2814eb7324da169761f096f440d2601b504ecbd2ed5ae50ca90a4778dd98
-EBUILD blaze-0.11.2.ebuild 2165 BLAKE2B f7dc05ba675c4f8ba4160aaccc8451a54f04ce4c482c5d0739976e4c167ca9536e2936a917e90d984fc48f52f49d4c4a163c29c69d92ceba41e8f04596f27fe0 SHA512 efbfd0dacc0fd89f53be928061ce9ed31ad0b3ce77a07eba213b0e8fb33aaf2c28b32405ce78c8b5150ad2b893a393bffe54446ee5f0fca7d734b021544cdb2b
 EBUILD blaze-0.11.3.ebuild 2171 BLAKE2B 3ec93a8d32e4d5a2248ffd5c0c06eb588f72a82a232b5f027745e5ff5e8f108f6f9218fba7d646b5fac25cb7024dce982b0860ea5ef51dd028db46d9cacd83f5 SHA512 2ffaccda982d3a34f5ea2cf19298f724e533541700af2b0b5a7a0e7a6840f3a59300846a72a32ed9eba06f0fe747d91d1bdc54d1b94b7643db907f968863b3a3
 MISC metadata.xml 619 BLAKE2B fcf9cafadca88ba8f5465f681c3fc87159a1e8f7fde68007f85d5f424682fcf4fae81b6002c73043f1fcb6c492e618277a2daaa7140086324ad31d84cd97004a SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8
diff --git a/dev-python/blaze/blaze-0.11.2.ebuild b/dev-python/blaze/blaze-0.11.2.ebuild
deleted file mode 100644
index 99732c0b7060..000000000000
--- a/dev-python/blaze/blaze-0.11.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Next generation Python numpy"
-HOMEPAGE="http://blaze.readthedocs.io/"
-SRC_URI="https://github.com/blaze/${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/bcolz[${PYTHON_USEDEP}]
-	dev-python/cytoolz[${PYTHON_USEDEP}]
-	dev-python/dask[${PYTHON_USEDEP}]
-	dev-python/datashape[${PYTHON_USEDEP}]
-	dev-python/dynd-python[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/into[${PYTHON_USEDEP}]
-	dev-python/multipledispatch[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/odo[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	dev-python/unicodecsv[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib
-	# trying to skip a few tests which spill errors
-	py.test \
-		--ignore blaze/compute/tests/test_mongo_compute.py \
-		--ignore blaze/compute/tests/test_core_compute.py \
-		--ignore blaze/tests/test_interactive.py \
-		blaze || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r blaze/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	rm -r ${ED}usr/lib*/*/*/blaze/examples || die
-}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 6f5a84dc8b4d..c025a0a6e063 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,5 @@
 DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
-DIST bleach-2.0.0.tar.gz 46083 BLAKE2B 50ff912e4805ea2eab034368acc98a37d852be7e16270028b95cef887358f56d567a860baae91f13ffebf0e2ddcd80121716ed2b0e2a59ac18150f6108100158 SHA512 78237c72224fc8facd0c247671c0e2deb66dc8dc46c446cfa7e8b83cce5ca99a52fec320ef59ae0ece47c54a48120de16e4393e269db9c74542c8165eeb96d2e
 DIST bleach-2.1.1.tar.gz 58491 BLAKE2B bd1efbfa30cee61b5d8bfd029ff107ddc997d38139bf5b25a70a6731193f6d02a81e1e49c9ffe3eef6cbda864464108cb1f65599c68c48f1033ced27fdb65c29 SHA512 dc8ef7b678966bfebddb2d27c78abf50e71f2d90c5807cf788a08b852a085a4d990368da5dfb5f61a49e0f2f1e7d9ac73c2b6967fdacb55663ae2c339016d4c2
 EBUILD bleach-1.5.0.ebuild 776 BLAKE2B f4c6c7bf1dc086c06012ac3096f7754bbd17ee289acd2ba7313b28c8c4b4964f4b6317cf1c2a7df23933d9231615deac2e540e8d6f688893c2be18b0b8e2f710 SHA512 582628df9c3cab952ecf07ea10fd7ba74debe71ad8ae261ab9a49dacedd76245a408a9a0319730ea484bab161a779f992bdadbd0447ca4b2c59dba755e2af484
-EBUILD bleach-2.0.0.ebuild 777 BLAKE2B f0829b4c40c448a22f7085b74daf6530c75056719cff68d772ae49e87544879d7e0a15a1c599fa5e855bcdedf94d0d2b1733d6bd58ba06711b6d11f65c93b75d SHA512 05035206b491762829c539d75a92d3516292560f9ee3f4dd354892db00c5c94eab4e2a71bf3a42efc04437863d3e7b4625783fab9f2e986221783fbec76c90fb
 EBUILD bleach-2.1.1.ebuild 791 BLAKE2B e31661d9aa6c48e6a2ddc996d40c15f8a8d90aeb142b1f6107f032b9dfbce09a8df7e275b9510f257c83215b71a328c9727c5ba209927456d3e00c4df79fe8df SHA512 3a535f04de70e1f5cc4352f23f1a5fc06d56e2ed16d91faf3f1a6dc9cba1282ce8792c14630835323c995d1aa4150ac192ed9ff720451b31551a5b1d56111325
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.0.0.ebuild b/dev-python/bleach/bleach-2.0.0.ebuild
deleted file mode 100644
index 1d0c20cec345..000000000000
--- a/dev-python/bleach/bleach-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/html5lib-0.99999999[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index e260ca7b0fb8..cee945d09d24 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,9 +1,5 @@
-DIST boto-2.38.0.tar.gz 1423863 BLAKE2B 074a379af19d4a63a06f0c5e257fe5ec30e04e5e6107c02a2da402991006ac73163d23099ec45a6396e2f09c66ac43111c6daf82ba4da97ec4c8d75b6a7b2cbf SHA512 577672007348db846d041c0906806c62eb77653b1335645cc852c603f5d32991ca648aacb884676af02043914c91ab6f41666b36b5b1ae23a3a354bdf9f3f75a
 DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e
-DIST boto-2.42.0.tar.gz 1442326 BLAKE2B 7b827d8905bb4dd28bc7e79ca92fc5197e3fbc34b61af4223581efc452288ca3f91071d5e8702afca3f934c9c1cc2bc1aeaf0a3f206054fe8784c9ad42ba5912 SHA512 5f45d56ef0d5b64f1f585f4d144cafd1bd2b05f1b0ec02748c27057f91ed9d94228ea2c24f4f081d4424285eecd1b749ca65952e769c4e94db0b944d79670076
 DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f
-EBUILD boto-2.38.0.ebuild 1280 BLAKE2B 6f59950f2d159a6e9d70ae9fc8d2b7d2f0448694f8da7fee071d73e9d3a2abe555252d39eac188ce81b49944d420046ae17419b425cb10d66bb890e8a6552d43 SHA512 043dec8773ed11cb5b8f703d790eb7454205fcbc86e6aade8c4e09866f8d0341d92249f365dacbb81339b295259ba0f3b58082c28ede0635a84bfe597e138343
 EBUILD boto-2.41.0.ebuild 1410 BLAKE2B 9cee14ec35b3487193301611a5bbad3d987154b1ca20ce7d6c4476a07a1f1d3c71168b67c0a53665308f33e4a649dd535ffca0c4caac6e5a8ee491b5925ca0ca SHA512 73f219dbc55bff52c6f950290d36aae287883d140fba9ab7bdc6d222e00de1da53208007a4237951b49d11a70db3e29cb1cad32ea31260c3dae78a4d95b7d15c
-EBUILD boto-2.42.0.ebuild 1422 BLAKE2B bdffda018309aa450d20c8d0fe665a28687d13b5d2b1c3882e6cf91b8d7da811b902d7009c1ef26fbe22866f1020c88a5a08a758bc09ef4b7afdb5ea1f4629d7 SHA512 a305ab8f19107375c069b23d9501b9e64160d2bc372756ea1acdbb279aa0cf10074b62c537950303a12ac261baa3006c4c72276e7a55b98ce170d269eda584fc
 EBUILD boto-2.48.0.ebuild 1422 BLAKE2B 2cad7b830caba3d60083c5407de6df482568f91fb444f52462e27e10a7a5ae03179f0fcacf7ee8f00907c75bf4311fed2e2917ab1cccf9a9305805a1e19364c2 SHA512 effd5dbc08d52f02dfb46d289b2d4a6e6b11ca47b72dca0b41b3934e8d515a8833fa3af52bf2dd49bd15cd24728003c0105fb83e5704045c70383aaee8a1fb70
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.38.0.ebuild b/dev-python/boto/boto-2.38.0.ebuild
deleted file mode 100644
index 8d7ac9a20b85..000000000000
--- a/dev-python/boto/boto-2.38.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Appease the doc build and supply a file for _static
-		# the usual emake -C docs doesn't work under this authorship
-		cd docs && mkdir source/_static  || die
-		emake html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto/boto-2.42.0.ebuild b/dev-python/boto/boto-2.42.0.ebuild
deleted file mode 100644
index 95e096af80a7..000000000000
--- a/dev-python/boto/boto-2.42.0.ebuild
+++ /dev/null
@@ -1,55 +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="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Appease the doc build and supply a file for _static
-		# the usual emake -C docs doesn't work under this authorship
-		cd docs && mkdir source/_static  || die
-		emake html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 0bde1ac4949e..a8ce7447e5d7 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,7 +1,4 @@
-AUX bpython-desktop.patch 374 BLAKE2B 473b1e9a9974070758c38250bce9bc7cc798489037158e5ffb6d409efa880b33184d68e9c6fe7dedba6d0785e73abf56e1a518a889c92cb7c6050344e41d509f SHA512 41e6e74bc1edb4631d4926588aa361234560b95d63d07c4d7005ea1577a6d324f49ae9dcd0ede2ecaec9532a3e48075040c53deeeaf9e1a97ab7749fedecc0bb
-DIST bpython-0.13.2.tar.gz 158551 BLAKE2B ccbfb15e0e0cc218348050f392227ffb09e8694ef9affd27f638a2b19a5c955d7340959c787f2e3d328de76fbaa4fa7b865ccee5dc2d13caebf5c739d9183a6f SHA512 6bf74c9618bf92fc6ca23c9020b17219c64b16f159773624b67f87875c962857bde2dd4b03da621da7c8d50622739f95a880638c7c536f5f0dbf510c71f5a874
 DIST bpython-0.16.tar.gz 201898 BLAKE2B 907f6a506d2b52db01e7b84c615574a7daad36f630646a345c963e432cc394330339390b6afc2585845b19d6c00d9c0b95e06b9d3b0fe85fe20daad3f5cf208a SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b
-EBUILD bpython-0.13.2.ebuild 1845 BLAKE2B a0fa76b147b69c0cbc042ac307f6367f2b5b70c3c0de18ceb81cd71cc655067e28a56a7fa587f702212339e09e1c20ae05256d50aadb2f08d96bf1abd3d1f69b SHA512 b71f202e0dfc74117e6ee776aa7f9e811c8ab5ce4a901f2539d7857d71b2c63a80f2af54b203f2d30e50b613189e02fd05f69ae2632c3801d1ef89f116e56b5c
 EBUILD bpython-0.16-r1.ebuild 1487 BLAKE2B 0f53fba5e2f027ebda8071aaab20bee2ee93d40630d57d591f6b4a6479bb2475b57664e99a8a7c87849400a303260b9aeb7ebd7ec0342a3d847e2e0675b695d4 SHA512 21e61a4b6d34837c71b40b3248d48c37a547f966d28f429ae6742c173589808afc27b28441287e0c40312bab5a3a56fec25223de70ceb9d949f49c544bed0563
 EBUILD bpython-0.16.ebuild 1483 BLAKE2B 25d5ab30d26946e42d2cf2345af7b37a9dc8d63267fe23d6fcdb977c3fce5d714eb7665f438c001b2bcfa877effda64d2f33179c20b7144570fe5ee83b8e4f13 SHA512 cd22c5d6ad08bc534255b5a58d9593fa75505b4b05064b520cb6653ff224a56e76e0e2bf37f55de4ea2254d2dbbf744a90b40f02c82978393feece634217bcab
 MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
diff --git a/dev-python/bpython/bpython-0.13.2.ebuild b/dev-python/bpython/bpython-0.13.2.ebuild
deleted file mode 100644
index 7241d07a77d8..000000000000
--- a/dev-python/bpython/bpython-0.13.2.ebuild
+++ /dev/null
@@ -1,64 +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="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ https://pypi.python.org/pypi/bpython"
-SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gtk test"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
-		dev-python/pygtk[$(python_gen_usedep python2_7)] )
-	dev-python/urwid[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use gtk; then
-		rm -f "${D}"usr/bin/bpython-gtk*
-		# delete_unneeded_modules() {
-		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
-	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
-
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/files/bpython-desktop.patch b/dev-python/bpython/files/bpython-desktop.patch
deleted file mode 100644
index 8598679089c9..000000000000
--- a/dev-python/bpython/files/bpython-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 bpython-0.11.orig/data/bpython.desktop bpython-0.11/data/bpython.desktop
---- bpython-0.11.orig/data/bpython.desktop	2012-04-05 04:06:42.000000000 +0700
-+++ bpython-0.11/data/bpython.desktop	2012-11-15 17:20:09.000000000 +0700
-@@ -7,3 +7,3 @@
- Type=Application
--Categories=Development;Utility;ConsoleOnly;
-+Categories=Development;ConsoleOnly;
- StartupNotify=true
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 4e21be9ef634..ec99737ee5f2 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,6 +1,3 @@
-DIST brython-3.3.2.zip 10140819 BLAKE2B e47279378f5c391ee48849738cf5079f039a2158a96c4d3b5f2b10b39cffd541e81c8b6b86ef91c739ab17a130718b72e43e2703d31efb18a47e266c2781bde8 SHA512 bfe93b238805de90a4421a3a0c210ed5bc863cf4609949252813d61b96bd1b52aa927eeac621932bec68ac8b23be793adee53327be387bae6a95db7ea89b5155
 DIST brython-3.3.3.zip 10040987 BLAKE2B a6a238ac6189e9170653c1987db46f2e0735f25deccaf0318ebc669b48dce1330acf333ef27300f1061e7e18044cfa24fadc02265d0fe3a83d0aa8b97f4de684 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249
-EBUILD brython-3.3.2-r1.ebuild 742 BLAKE2B 9a19c4a8dcb25ce3ec0ccbc17a1b730fee92a8e1ca23af5f76aa9af03e83c3f935b567b85f8c28b624aa1716769aa25deed44e8453c190d18b89172a89d27104 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60
-EBUILD brython-3.3.2.ebuild 629 BLAKE2B b035e7c2dd2aeb7ec1064399e8297addce9c6c150e89092297523d2f92ff303cdd36c3d61c7f91760bc8b06e0714cf3f1a777a23d80f5f9cf69edbc6ac091bb8 SHA512 f5a1a99ce16b6f699ec1884b572cbed011c1cb07eebf1600e335211e4f9ec8f0ab03e9b56edcf3bfc8a84270092c7a2058917ea3ec34acfb2adff0c8785f772e
 EBUILD brython-3.3.3.ebuild 738 BLAKE2B b56b0a47006068b90794ec3673972e3e2fccfac1d46624ca94193c4874978debeefcc7214e2b2009e6d7fae90793bceb58a08df8860850affba6cf6cf9680ce2 SHA512 454f63ccb33263c37e4e915e692a3c656a4ef04702e2070e49cd7584463ee52fc54972d69f6039461988e1d9fb7467ae5be847d13aeb6b846f3853bb188b3b55
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.3.2-r1.ebuild b/dev-python/brython/brython-3.3.2-r1.ebuild
deleted file mode 100644
index ca62031b60cc..000000000000
--- a/dev-python/brython/brython-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit webapp python-single-r1
-
-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"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.3.2.ebuild b/dev-python/brython/brython-3.3.2.ebuild
deleted file mode 100644
index 230fd50c5231..000000000000
--- a/dev-python/brython/brython-3.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-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"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="dev-lang/python:*"
-DEPEND="${RDEPEND}"
-
-need_httpd_cgi
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index e33b12ee34b7..8d3ec134361f 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,9 +1,5 @@
-DIST cffi-1.10.0.tar.gz 418131 BLAKE2B bd01e95cd88f92ac0f87bb79ec8c56b6d7468e80344a14545bedb3c0311736649c783592c7ff3dd2e334b5466f89283ba4af5ac0eb0afbafae29ad0ada8b51eb SHA512 02c9987c44698708dcb7e0aa17637df6b15f81732dc25b03e54563ca5664a817863b87daf7a782a62c7b6150388cdca858ef496a975ab289c86f05e5492465ef
 DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c67212b546d42ca56c3360496d01c59984f72d5ce61b1160aa6117b869e567b17df8458de2c88a42dc5e653f6129 SHA512 8ccd8988bb6b4beb760abe5d8cac7cbf65a7dcfad5a535343e5961912751f426fdf6e602a983430e6aa9f56f2f623855b0cfb5ed8e5294a95d122866a4533eda
-DIST cffi-1.5.2.tar.gz 388793 BLAKE2B cd7c197a3b72084e3ef904e0467a4195e379cc0c51f75592547a5c59d12b33284712f0a967c4089c0aa90ac8c179d47ff62e6b303380eb162656640a78fbebe7 SHA512 3c707db85032bc13287beec0211d85a7b9f9dfcb87844adba3a86b23211acd495e88072ec23f22e7c7626d25cadd5b9843c34255d4080eefb171020ad0a2d552
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.10.0.ebuild 1480 BLAKE2B c23becdeea76e177e8dbe0477e912c530bb681b135b21d589de0572da460954b9af97af8c241ca690d155a9d1926ccbcd1d00d86769cd995929d20cd0b14b2c7 SHA512 53a7ffd66b39c0913db5fb8a1d299964311243282a0adb95b3a909fa1875777d5a4d0fa730805a1f488a157f27083f6221884662ed6e57d6772e752421a62b5c
 EBUILD cffi-1.11.2.ebuild 1480 BLAKE2B c23becdeea76e177e8dbe0477e912c530bb681b135b21d589de0572da460954b9af97af8c241ca690d155a9d1926ccbcd1d00d86769cd995929d20cd0b14b2c7 SHA512 53a7ffd66b39c0913db5fb8a1d299964311243282a0adb95b3a909fa1875777d5a4d0fa730805a1f488a157f27083f6221884662ed6e57d6772e752421a62b5c
-EBUILD cffi-1.5.2.ebuild 1455 BLAKE2B affb125413c38eb64c8d4a924f45138a6f6459b972424c1002e4516979e8d1b2c428c854316dfe080cd83b19c19d9497110ecf6897be7842344aa5cba911aa17 SHA512 645a517547580caa1198202297c741f4fdf39711f2db34eb6bbd3d8e1d11482baaeee704f9c2d9a48565221c78d4ee279a90171164dabc46d31937e67f9d71ca
 EBUILD cffi-1.9.1.ebuild 1470 BLAKE2B 9205a47a11f98db74678be1a1db8037bafdac399ccd90a9ec20b347a39ac69ef486b53adfb72e9482bca0922ff06cc4a85d23e251600c9ab34bf18d0b815563d SHA512 54dce8ee5a318e032fe01e6e47682674a7f9c0f5d04f56e96ffd028902d19e2bceecef123cfca68f3c0048ca40193fc49ebaac555ada72847642331d85ccd7c3
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.10.0.ebuild b/dev-python/cffi/cffi-1.10.0.ebuild
deleted file mode 100644
index 63bcc3190973..000000000000
--- a/dev-python/cffi/cffi-1.10.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
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.5.2.ebuild b/dev-python/cffi/cffi-1.5.2.ebuild
deleted file mode 100644
index e347372cd913..000000000000
--- a/dev-python/cffi/cffi-1.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 97d82f061371..a766e9c62696 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,5 +1,3 @@
-DIST Chameleon-2.16.tar.gz 200838 BLAKE2B 0073d2f9d3903888b672b0b229af5dffb46dfbe455a23a70a3f02d0a49271c9cdc6d10af8b48448607421a426fb05b9dea1733e7931fb6b17fac7d6b9d296f90 SHA512 a6f1491a11e55231ed5304b297d749dd590f1d0340732e00d20e4af1b311df297df2a72cc79f0e4949e5ac00acb9dec29dcb50423facb2b3bcff6ad3d1d75350
 DIST Chameleon-2.25.tar.gz 193965 BLAKE2B a6ae7768c52807a82229d75fc044116a77df5ae3032a98e44558a1d2b3ee2f427f3291b7c2895639050ea1e9fda0e6868ca7b8299cbbf1d5e1b0714af0d835c0 SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d
-EBUILD chameleon-2.16.ebuild 815 BLAKE2B 277f0f10f0a62a3e3198d6c5d4f3bf54a1c5ad14911ed974643322c6b058fab645d4bbf422a15884b9958ee9653ff36769e93736fafd56889b64365bddd715ff SHA512 4fef67ab4d9f34ee81567dd23ab99c6c046933fe199f0f3120b8434da672a3f2afb8de5ae6fea1ddbaabc5c74cbae6dbfdeb873d3fb3f7c54c314028980d7110
 EBUILD chameleon-2.25.ebuild 829 BLAKE2B ae177a5bda6019c9117fe6d9abc922f2e34edce1d98c06ec23f76f02ce8275e2946d5fd301c9ff23506e2df6eb1638f1a3ab69d6ea51dcd9854b3f99e16bdb4e SHA512 2f9936993c8fa58664b6c05bc9177797634256b173faca66ce3dfc55774713575b9fb25dbad622e377f77eb8a1bff220f506bcbf5af3053a94c65abde722474e
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-2.16.ebuild b/dev-python/chameleon/chameleon-2.16.ebuild
deleted file mode 100644
index 5d3e5de5d410..000000000000
--- a/dev-python/chameleon/chameleon-2.16.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="Chameleon"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="http://chameleon.repoze.org https://pypi.python.org/pypi/Chameleon"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index cdcf754aa5f7..a9d966cd8e05 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,5 +1,3 @@
-DIST characteristic-14.1.0.tar.gz 24612 BLAKE2B 19720a991602d1c0c41daf003feb16eeaddcec21b51cf60018c5efdb2092d99d37a89b7902f3db677dfe8436d3ae3e6c273234a18d4fc68d6f285825482d13b7 SHA512 21bb40814f405c73471a83e15d1cfb07f74ebd157e647799bedffffd3909271145347eaec8ec09470dddad7224d1a15e8984a75f1fce00bbe20f9e1cb385f9b9
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.1.0.ebuild 1106 BLAKE2B a9ab61569f7e77b2cfbf01d7eeb912040d0dffa2b615dbdb94ab772e3aba1882d5691c27bf1cadb277c70ae64d511a30cef554d2b3fe45e238cf515656da0138 SHA512 04cfa207d49779dd3edb9878de28cded4d9cefe55b6cdeb610bdf2d048601bebbabfe028624bfc0d6d541c2bbf6d9e27833c82c569bbe80759052bcf0cf8aecb
-EBUILD characteristic-14.3.0-r1.ebuild 1034 BLAKE2B c107a68a54b816c40bafde5369d961bed9609595c18cf669d8a398d728985045b6fdb6241da858815f9df2e48dcaa4185cd6bfe18700190084272cb0cf78855d SHA512 8b35b3de964529feec6611b74e3ea593cecb893e9c31b244b501e44a282c4b0e08cc34d083d66dc0bc3be4cf616d8e0e19af286420a9d9c4722b656d0ebe8d5e
+EBUILD characteristic-14.3.0-r1.ebuild 1038 BLAKE2B 8ac81175ffba9e44311ed80ee0bc2002011b27e2062e2782fda393fe8cb05e5bacda13c0c210a7e00e0d2dac5de736c4a274f716238bc35244a2f54853869395 SHA512 5c681179d1157b89d841e7947709dd4b6376746bf9dc5cb1cad02465510a68a7d6433306c8c4912693ce1c16d81ab2a3708a2041a1c7786973e0a708d1ecbdb6
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.1.0.ebuild b/dev-python/characteristic/characteristic-14.1.0.ebuild
deleted file mode 100644
index fb2a02327729..000000000000
--- a/dev-python/characteristic/characteristic-14.1.0.ebuild
+++ /dev/null
@@ -1,41 +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="Python attributes without the boilerplate"
-HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test -a "--cov characteristic --cov-report term-missing"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
index e0f24b01e2eb..4bbc41b38bff 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 9f4a48d71049..698d35ec00a5 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,5 +1,5 @@
 DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 EBUILD click-6.6.ebuild 1195 BLAKE2B 83f33bd9296d422d18286ea4689418bd91879b75a1cdfa493ab6765f7e4ecf493e52607e5065d9bd5beb21200dcb5439c1abf6213d94ffca62d398dddcf700d5 SHA512 bf17a9ef65d5dc3b31a46f76282b7a860ac4689590e3836517fd74e81763731ad890f7084b397b453242f136604901c1f38cbe1214d314598239e34d0274c221
-EBUILD click-6.7.ebuild 1200 BLAKE2B 65213a79bb6664bb846c69177d159f35259519f10202ff737fcd299688211f81a42da18825992dc773439a0eb8337be73fc67289e3e3cb48471c6826ea9c9a80 SHA512 a185b9dc4e34fad24f14e5c3919ad8a6b0b5a3d9b1b0eb39629887c70a96a3d41f1e1bec19a1813f741488b95b630ff3db7f2b9a2ba7187a1aed26946cd7d6e0
+EBUILD click-6.7.ebuild 1199 BLAKE2B cf5a70899be3a49e3f29326055dd54b0c044599e8ca91505bbc8ef40155bb783665c3d7e6e32a77c4f3f2453c0dd5d504aa1579e2ceda96dc7436817540f8fb1 SHA512 fec7a805c7c7c31974556dc8f30e0de68238730dee4552b8ccb8efa0cc4aa4df2bd78d03c014be31d6cc626d262c05b3876f2411204acf7976e96992e3f6973b
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index e8f018f4e9b5..df2868d911b7 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.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 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 4fed9e2d6382..5b3ca6c0788f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-2.4.0.tar.gz 58088 BLAKE2B 941be063cddfaed28c21d63a24c5d29a5ac42bca7d8d8b660ff7e71afbad9e24cfb3dce6dd10b1ba9bd47de03f5ccf99823c9d6c1ac9422716d7410bea0babdc SHA512 2683e9c0ba56a473abfb08a4def07a1025930b9af100ba18ade7dccf1c73f2d4ddec1cd109ce948e379e41481556791c7620289af910243885a52273d936aef4
 DIST cliff-2.8.0.tar.gz 71815 BLAKE2B d73d467a1e2e06e5f45e7fce766d6c8daf79d9a882692c0e77049427bb6de629409a282c8c554ba92c62a9c8fd44e0b19cd3cd93b9b3f1f2b8091a1e917a25b8 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3
-EBUILD cliff-2.4.0.ebuild 1563 BLAKE2B 34d5764e31311026095d55c073edf278d6d3fd3cd793a356c6c9b48e042a41cbb16ed01c368afc42b9e20fb5bbdcda8ea38e5cb1e435d4bebead1c4bc67464bb SHA512 3b2bb31bdafefa030869e8151ed4a5c8e78b6767c64a81b65f622cda8fabe057a1fd975d8a745e9dfea7586d49a27d69f7aa2ec106ea7dffe0e5d9b50128555b
 EBUILD cliff-2.8.0.ebuild 1803 BLAKE2B 1c356b186cd61f0b64ec018b9b798832541d967bc78335e6ac8c1bb80b20656bcc7d05c4c6bc62d4262ecd2efce17e1ca0db2329fd748919b78d33ad72edeb86 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.4.0.ebuild b/dev-python/cliff/cliff-2.4.0.ebuild
deleted file mode 100644
index f84e3bbca81b..000000000000
--- a/dev-python/cliff/cliff-2.4.0.ebuild
+++ /dev/null
@@ -1,57 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
-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/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || 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/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 4babf3c7af0b..d8163a0f3a14 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,3 @@
-DIST cloudpickle-0.2.1.tar.gz 15514 BLAKE2B 274cef7a9dc33e9048dc1c6d11900af1cf70bd7ba8467eb90bffd7ae64d6ab556e22f17b917dd2b44cf2747aeac9b4375ab3616069b367b690a06ea44128cb9f SHA512 ab098186c04db1947fb6c4c92bb4708b0c45122adf0435f5da70a0cb24c08cf6d36ce627ea112a8ad8d0107a28b12259435c3e1aa2ab7a6f8f4122e5ca756e2c
-DIST cloudpickle-0.2.2.tar.gz 17020 BLAKE2B a3fce4f2db4c3a00e1b9ae04d6c6e1a0bc9100ba5eba778c4ffdbd407c50cc328037da9885810cb4beb7c7e4ee6a4820f063a3e0098c1e69367b36eaba8c9d54 SHA512 798b745d4059c34026a785fa32e6ac68aea689b3f4f8fa08d625eebe65651eca55211d104e9eab315c7c22dc720cbbad88cb1a444dac51ff457bff8d26c43756
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
-EBUILD cloudpickle-0.2.1.ebuild 652 BLAKE2B d52a8644bc337b2d5e8ab370669b276bfd282b5dd10014bcf66596f99c98c702575bb07c5a0554af5b483946d1e0a639f40ca00b91072a7fcc38a50f344c2bb0 SHA512 26ea3a68f21cdf9c179d1feb96417968e85d4994e52cc361557d736577f67fad65cfc69dcb5619f250170842a5f692f6a5222066be0314cb5f3081203b48859b
-EBUILD cloudpickle-0.2.2.ebuild 658 BLAKE2B 15502a95c26d7a60d1ca3f3c034bfd3f9f7b2a91f02af46a9f67f48eb61265e0058e8fa7424b8de738aaee1392b280c15753b6b304e86ada590a0a4f8a2a6fd8 SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da
 EBUILD cloudpickle-0.3.1.ebuild 656 BLAKE2B 3e5f30052c96f5bd6f3e12b7dd478665173a4ea22c35548ab5828ac875d6728cea34b5ca16e6a6ce827c38f0d4f7642a43ddc56abc276dcc297741b095431329 SHA512 86a4c1f76e6fcc295cd4533915f61a370f891f3633ac7564eab903ab2219a449199c2f874dede26fbed8b31fb3544964533c80efd14288c18a5dbef14d9af125
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
deleted file mode 100644
index 0552d56b4a30..000000000000
--- a/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-inherit eutils distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	  dev-python/mock[${PYTHON_USEDEP}]
-	  dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	PYTHONPATH='.:tests' py.test || die
-}
diff --git a/dev-python/cloudpickle/cloudpickle-0.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-0.2.2.ebuild
deleted file mode 100644
index 3c344a15bc7d..000000000000
--- a/dev-python/cloudpickle/cloudpickle-0.2.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=( python{2_7,3_4,3_5,3_6} pypy )
-inherit eutils distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	  dev-python/mock[${PYTHON_USEDEP}]
-	  dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	PYTHONPATH='.:tests' py.test || die
-}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d4e9110469d0..a89fb56550bd 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,3 @@
-DIST cmd2-0.6.7.tar.gz 20558 BLAKE2B cfc2f3dc111ddf225f3181a6c67af9a9c973f7e4d2ed9fefd3f7e5bcd82d1e8d3d3bd99b5a25aff17e591c11a80f57bf12f609b5434c17d4f239e9c54227c726 SHA512 a37393bd9ef6c3ece02249b5a4293a25889ebd68120ee592d2ccd77a8e3e4ab3ba724e0be7f3c98a453dbba30c1851c7f690fbe69711df8a723545f8dbe38607
-DIST cmd2-0.7.0.tar.gz 371786 BLAKE2B 0e705b85118ed3ddc870c0f161b74222e598b6e317037928e20799f9907b3a13c7dfaef0a5ed8d3d8c035283e8a0d6e55615a69528f1e5a6cf2fb85bc89fbc86 SHA512 13f9777908dabcbf9c81c0aea371c7c55e413616dfecc75b51b18e38b286656c9fc2b7368c859585a70d574c9c04413b1e65a5a58aa878f90283c31a54d49465
 DIST cmd2-0.7.5.tar.gz 64939 BLAKE2B 57c8d3f4c7c94e8e2627fb5d2cf8c164da72c531808a53118f950ee79fcc2e0f431621ffbd74d275bf508c8646ded761d2d38c2b99570fdadbbaddf095e422a1 SHA512 14376ee283ac1c153ab0194a5dfa168eca36174783322ff72e190ed96b8c315518fef4f3ef09d77633851cb53b32f71fe380042ee3c0ef8ef2cbdfa16dabf704
-EBUILD cmd2-0.6.7.ebuild 648 BLAKE2B 6653172e133d5daa2ee4fa9e1b71be3e4f21415500d4a2d183ce04370e7215db3308dc5934c41f41f918765ff2918647f3cd483f4a05ab70c46c83f2c55fe50c SHA512 5956c34777cb991ae9b2335b7d9de24f4fe04e01fe20ef4c9e03e1d31377432298057597b442f013bba633ff2199b9935f311aa5d49b3e803c16def38258194f
-EBUILD cmd2-0.7.0.ebuild 1019 BLAKE2B 8b6de3b2da8cea417bd6795dbc7c647eb51914832d69007e20ac3f4136dc38e892782ee815902744f46b84673dccf9f54ac5b5e41fcc3554f97f621e57610eb3 SHA512 f6444262e02581ec916146b70fb33f3a9deb724bb20a325d064f84d3da4a093aa8f4c1906d32bf14e6d2833b9c02b90f2352496610d353aea5f7d897e9d89e9e
 EBUILD cmd2-0.7.5.ebuild 903 BLAKE2B a70910a059ed60cc5020f02cb72edd76125ec36294086ebb54d7f228ebfe1dc68b6c0497a2a398511243bf238aa58bd75a56f74617480a244845a31fad88b0fb SHA512 e99f600e4ac11649242aa8155245e109cfee733915b59edc48f76c2eb48cbc0c6649b21781760ef5f6d006418e5e1dc6c4069d6943613881533d25a63dcdbe39
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.6.7.ebuild b/dev-python/cmd2/cmd2-0.6.7.ebuild
deleted file mode 100644
index 7b9f19dd3fd1..000000000000
--- a/dev-python/cmd2/cmd2-0.6.7.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=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	"${PYTHON}" -m cmd2 -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cmd2/cmd2-0.7.0.ebuild b/dev-python/cmd2/cmd2-0.7.0.ebuild
deleted file mode 100644
index f78dccb5941f..000000000000
--- a/dev-python/cmd2/cmd2-0.7.0.ebuild
+++ /dev/null
@@ -1,40 +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="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Disable failing test
-	[[ ${PV} == 0.7.0 ]] || die "Please remove the sed from python_prepare_all"
-	sed -i -e 's:test_input_redirection:_&:' tests/test_cmd2.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -vv || die
-	${EPYTHON} example/example.py --test example/exampleSession.txt || die
-}
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 72ad493d632b..c53b24d9ccfa 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,7 +1,5 @@
 DIST colorama-0.3.3.tar.gz 22765 BLAKE2B 3dc399c3a073fba825e85c667c6af1a5b8777dc65ff5ae8fcdb7fe6d20a3193ff391a28140ee90316893250a61b77bd8efca9df03ae88c7f20c24545c8f30e4c SHA512 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495
-DIST colorama-0.3.8.tar.gz 25043 BLAKE2B 8307a6f3563621d1995cdb97db4f67547744974c7c79a2bdfd4f59a2a6ff700b050f3342b487873b2370e29c9e5838bb9942cab5448ec15e04b54febf0c2d714 SHA512 daccbae90c986bbb23d87b6fce97e53fafce0284ee5578b642d925bcd8f162919e61065494a5b31ed3d2c6b28b6543fdbf84c477745f6540ea607e2d13cde319
 DIST colorama-0.3.9.tar.gz 25053 BLAKE2B f633a188d032c41d0b6de60540ca1774dd8f3e8fe2e558333baf09855db30fa7a7ade5944ff12e4ca1a3685930d10a02009162733666d711ad25a16ee96ace55 SHA512 248e3d3d1f95cb85baf55ef4d705508213b81edfb04b39fe9a7bc9c7ac564986726ab6e9d9f73d64ee02e1c9b86d4c6bba40543590dbd170180a37d69e07b627
 EBUILD colorama-0.3.3.ebuild 680 BLAKE2B 28187430e166e317c5b9cf562c5406e6d845a811ab3a50d23cb19e2769e5045a974fb5fe5f0f16c3a4189f25eab6eec5545bced7ccea884f9199d3a5a4892d60 SHA512 9f13c66dc9660376b7705ea3aa28d22902b528c8dcd97ab25e3074f67b077fc062f609f26e04e19f2e8846fd3a12548d8ddb27d9fb5c9cee6addf0e40e7be239
-EBUILD colorama-0.3.8.ebuild 778 BLAKE2B 400ae074c8977db828f4ff366cfc13253ebc19cbdfa47a60b28950f163b76550ff13c7d4c0f10de7fe73ef0efc931a36994e3bed6866f6f06d468af33baf8f1c SHA512 daa6c0d11119580a8437a29efa29fec6d7030ea85b1db31efdc4637ad32d0d7841f08a311093bf28628321aff803047557f9ca1dbd5599f141973cf36e9afe64
 EBUILD colorama-0.3.9.ebuild 778 BLAKE2B 400ae074c8977db828f4ff366cfc13253ebc19cbdfa47a60b28950f163b76550ff13c7d4c0f10de7fe73ef0efc931a36994e3bed6866f6f06d468af33baf8f1c SHA512 daa6c0d11119580a8437a29efa29fec6d7030ea85b1db31efdc4637ad32d0d7841f08a311093bf28628321aff803047557f9ca1dbd5599f141973cf36e9afe64
 MISC metadata.xml 682 BLAKE2B 9e9eccb56152824c5d47896af7ae8a699a9a614437f20008fbf9c793e0b79cf3dfb0fb6b9da6d36be4d699b2df8817f74a74e098b8fa945e08734d9f068cca12 SHA512 0a9144ad52b490c2e607eae85aced164f4c2f15c152592ca67a588d659c34c3baa16105746fd4a6894c49ca31ee4b0e1b18957cb7c421fc788cbc933afb3e895
diff --git a/dev-python/colorama/colorama-0.3.8.ebuild b/dev-python/colorama/colorama-0.3.8.ebuild
deleted file mode 100644
index 3dd40613fdd1..000000000000
--- a/dev-python/colorama/colorama-0.3.8.ebuild
+++ /dev/null
@@ -1,29 +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="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.python.org/pypi/colorama
-	https://github.com/tartley/colorama"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/common/Manifest b/dev-python/common/Manifest
index a8b49f2a8d7c..31a34ac03b0a 100644
--- a/dev-python/common/Manifest
+++ b/dev-python/common/Manifest
@@ -1,5 +1,3 @@
-DIST common-0.1.1.tar.gz 2695 BLAKE2B 4038b5664e4d7b4a0ef9b23e6ecf03cd37cb97b1949f6156fafb1111ca70e2890e9572e1d7de30a353a6f4ab5f111a59946fd73dddfeb35232a4f3595dd39d61 SHA512 9bc76b762bf58599f8bd15c0e66fc5eb5898b7e3401d7a4908ca6a58a4f8040bb3fa44f016de62a129db2cb932ee724dfc59f42213f65f61a1fd399d3738eec0
 DIST common-0.1.2.tar.gz 3541 BLAKE2B 5791d91a49776646ebb57bedacfbaa4b87f61ab89b4bcde2e147c5712c66f5c138b7a94f48421b751753cb689fbbd91badbf5a1fbbd185286c574f1316be7e16 SHA512 2cba2602fde34ced5b6fe603eea0aaa6810981089c9484f25ede16f6910896e783312f4d7bfc411d4eb8c278967c21ce000c3d1eb2a775d2bd76728eeebe80dc
-EBUILD common-0.1.1.ebuild 466 BLAKE2B d9ec1197d02bea4bb0d4cac5215e3f8e80fef751a7e98430812260b56c781b45bfcb3cfc9df953bd38df3f8577e805ad57d5dd5c4411f888939110b3298719ea SHA512 3e607062ba6f8961f65ff0157c5daba8364600c9e7fb80febe4570e52de0b2fbcfef1dc2b32de086ea1c438315050110541b404ebe16009e4937b8bcdf927441
 EBUILD common-0.1.2.ebuild 474 BLAKE2B 77a8b92ba67cc2b1078d364e02afabaff8fcefdf92556d40122c969b94daaa73b502e2aeb52488535f2f6e19b55cf8ef1c3575c4f6bfcf32886460eb309e3b08 SHA512 c7d7b2509e40741fd17c623666cb942ede58bbb0ae5e7a1fcca2852a9e9ea77138cbd52bca97fb810d3af4a6e694ae8d97fddc1b177502ab2a112b2688f0fc6e
 MISC metadata.xml 319 BLAKE2B 6a196e1f5ae09dfa304a5c3688104ff09a078eb413d6069ddc700b16aef64e9cf913727f28db7f5a5c75868d1ed55512ca9d7a3bdfd08a3f255dfa47c85f1e50 SHA512 b3e0c5dadbc5227193b6ee672f8e8d7671d1aa20f5b77e7efe01873d6a47432d19855243a3de17c3589988efd7127ce654995c75032db4a889fbab1982c0ab5d
diff --git a/dev-python/common/common-0.1.1.ebuild b/dev-python/common/common-0.1.1.ebuild
deleted file mode 100644
index a3482b7fa037..000000000000
--- a/dev-python/common/common-0.1.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common tools and data structures implemented in pure python"
-HOMEPAGE="https://pypi.python.org/pypi/common"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="mirror bindist"
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 4e6c739f5bed..00332c3e1adf 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,3 @@
-DIST construct-2.8.16.tar.gz 719786 BLAKE2B 44d90014136612080f4a97fa32845b7610bb2378ecf0ba81b105e265874c3d05c18a70f98a6cba1eaec69b5b68887b0611b7aadd4188c196c99fd15c2b0ca294 SHA512 6128da944b323b58f79a9b386fd9dba65fdcc31ce8da2b6cafebfe2f126031dd77ffcfe4885020b6122304acf0b0f87792ddf79669517b21ac1f49952c2c46ee
 DIST construct-2.8.17.tar.gz 705812 BLAKE2B 3178f7f59fb893bc521c88b7ba51d6bd83cca37c1a243e602dcc2ac41a2cb7335e2cf69e7dff3b130e974ff9dbd01a12004423c3a88fc8e88c784c665437e901 SHA512 5bca40d7f33f336ab2a66546027c8bf24bf1b0125bcf425063b3bab14b1e3a96577d602db1eb73cb0ee99f90d92af6e24fcbd228912c0a70de6b2bd7d33e75be
-EBUILD construct-2.8.16.ebuild 927 BLAKE2B 3a6747a0a8f66cb3d4852bd9eeea7564dd727572e0d5152f635e5abbc7e7f8a5f2fe45c38239543c0c4ba11b093495893a040f6befa931becb1cc1f722d35613 SHA512 7ac7dfa0f8d833b8c4dbe16193594d04587cb3a7a8fd87b7fbff4cb042dbd671e85c25bae7a1b15f203836dfe406421090959330672ee3775b2660b5fe3c781c
 EBUILD construct-2.8.17.ebuild 708 BLAKE2B 1c67690079a5c288769c30c8717d0ba83c8df1e22fbfd84d81427364fc8c7c19947d6d231cb90b08a1137f16ea26f2df126872e83be210cb4893e33d4f90e4b5 SHA512 74633e9f4beb1abd73ea78de7e6ea6821f0ca0d0d0e429d9b90105aae5bddec5f7452a15e48824e16a2cfefc379d3a0db26b163a84a722367583d61ccb6f758d
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.16.ebuild b/dev-python/construct/construct-2.8.16.ebuild
deleted file mode 100644
index ceeedd6f36d5..000000000000
--- a/dev-python/construct/construct-2.8.16.ebuild
+++ /dev/null
@@ -1,33 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -vv || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	ewarn "Version 2.8.x has significant API and implementation changes from"
-	ewarn "previous 2.5.x releases. Please read the documentation at"
-	ewarn "http://construct.readthedocs.io/ for more info."
-}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 630d9fcb756d..868ad9cb3c80 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,3 @@
-DIST coverage-3.7.1.tar.gz 284735 BLAKE2B 4d3b04df7671536c2330abef656a0d53646e79481e451b80810f90445291e9b92146d644a996222bad9511bcf1fef6d20226ebf005c2f9420de30dda8d18abe8 SHA512 d198b06db938119fad8c13b9a7bbf018a5406c29327c943014e3b9b33ea85f0fbadaef6565fba26a461a3f1ee31f4cbfb42503420cc587c846ce499e80fd5133
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
-EBUILD coverage-3.7.1.ebuild 884 BLAKE2B 304c6c5b51729cc6396aa8748b91b5ddbdc6477f82ead1f4e1f418c56bbe65b0c8b480818030e935ba4adc1057dd5bdb2f106190734658d86f1b039c43b50d89 SHA512 893ee73a6a179ce8744c980c298b3c72f9a2d990b27d8bc340eaef5798dc8dff08b1f9cf1460754559a07271a180c7ed1746f2bed57a5e4874c2439358fe1b36
 EBUILD coverage-4.2.ebuild 1246 BLAKE2B cf38f93e98db5394649ec84c8e2a3f680d8ba34603e17fff28d1469a4809d6ebb04c41da09f0ebe808c5d59240838a937aad8f2ae85488cf35d28f5071bde4fc SHA512 7479203e616a242b59548738840d843396c2119d1b64109b7f52be39907c8d68552684688d91f680cb7c658dab47b20cb12af15576e057b9e826dcf053b51c4a
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-3.7.1.ebuild b/dev-python/coverage/coverage-3.7.1.ebuild
deleted file mode 100644
index 29a12d5775cf..000000000000
--- a/dev-python/coverage/coverage-3.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index ee483e8f4378..aa45e33e9907 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,21 +1,7 @@
 DIST cryptography_vectors-1.7.1.tar.gz 26652514 BLAKE2B 5aa670b4d52b010964465091660205fea4b7de1099701e25a6e31da9a7ea4a312a81a488ed369ac6b032e8232514361f87f1b0946cb55e0e0a18955874d2f09b SHA512 2edaa91198adcf5e2523ea8d3d25a8cd7df85e6f6c06618301f87af6f0133f5d4672721082205a9a3c0c648390ee772e6107eb6ba76e96649bc2832676df8283
-DIST cryptography_vectors-1.7.2.tar.gz 26652633 BLAKE2B 5f218ab691e35aa83601d3db76d457620df5d4cac4ce239ed9eb49ffa88f6908bc628022a26d52066dc3eeb0dac0fd09cc52e82e2c6ea2af88c43637c77b16f0 SHA512 997aa703649cb4b1dc7df37ed2843a6c06a3871df3d1bcf9ebde6466c32103512225d668e6eee62c89e20b74a5885aa2974d82b2cbf3065a902d059268bf1137
-DIST cryptography_vectors-1.8.1.tar.gz 26653746 BLAKE2B 7519a246338b2d8ebd6ceeb47c17e602bbdcdae508beda2b3f650ff330ef12a993d7eabcbb792492783cea09bb2ee4639b9028fcb825dde64db7942e5cd5731f SHA512 78cf2a50ebbf0b11c57a53ac683a7ee39f157c7ad04d6374cfe5448bc474964ef61f74d0edd63b5a6b871b4efacc0b3fb9ea8d6025a99567ad2e6a5ec744255d
-DIST cryptography_vectors-1.9.tar.gz 26653563 BLAKE2B a99ee334070f204b25fc55f795378decac1813188aa157c399cdfdbcd4f6637ede9712976035ad7bd1efb9d5605846589d5a15ba798efd20e43b812aec032b2d SHA512 3c37dc39496b66539f54bf377b4653b59abaa81fc9fbd68e2d337acbfe9c7fd80801b37ddddc2f7698356b22fb9bcd9f8a41ff95ee405b208c267c0fcba56ead
 DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531fc649a9843a9b7083a0a7a726ac89201f37016e258538671b15d4197deaffdb6902c345ff40e1da604e2b6034148d9c204b0ab1d SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36
-DIST cryptography_vectors-2.0.3.tar.gz 27011810 BLAKE2B f4f8b419ae2c5101ff06dd0b6abb972b06cf11cf81839cf70a2db9e03c8f76a5d3220b4c60a0200bb1177772b43779c22a7b253f6d9e6b5fd55ab4ec80cfc734 SHA512 a944ca7781d47e6e81d69c32a717a19c2f461412e38f4d2b93cb02309bacdf01d766f7227a20b520faae2db20cf3dca194ed3c34363dcc70866d9ef6200f65cc
-DIST cryptography_vectors-2.1.1.tar.gz 27255936 BLAKE2B f93bec623a7c0b29ccfddac62750f9cd1be8f50375b5713e15e666df736b4dec67947b468ebe324d84c6acd605d363872176ec40a22c3c0f319f568a7ae64f95 SHA512 fa32a52a3e187d62c3a8eb4262795d0a9762fe8bb5d8464bc9bca7b1a56c6e19a3a14bfd0b2f56f4a048a8cb4dd05e105a90925dd4ee0697a76de3577faf88a3
-DIST cryptography_vectors-2.1.2.tar.gz 27255884 BLAKE2B 8702e18fa867d539b71f50279670740c898e1408c3e60a9558a4da69074c5e68091860bbf00cb0eac22a4298715f09a863165e0fc819aad641729b8bf7a3eb73 SHA512 e12c52b501e3f9974237e6b02b79e602e1c44c97928304560c9d68beca68be07acf2bb3cfe111d1cb0357ad0b9e458fec241463e63ec65fb223b65e1dbbeedaa
-DIST cryptography_vectors-2.1.3.tar.gz 27255719 BLAKE2B 47e4a627b10b1d38db19ec28bb8bef1569380db150e9a9a8ef9dafb608106bac79bd25d690fd7b5ad5d45d7f8f38f06ed7eb4d0274551a0d4238785d1e3859a4 SHA512 09b7040bc5ef0d0c888ac3dadc325e76c8156f3b6aedba1298a07156471ce08f093ff953be413a9dde66d7db9d2c8ae22d0f94e323d961a0eb99fdb022f166ee
 DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165
 EBUILD cryptography-vectors-1.7.1.ebuild 632 BLAKE2B cf2ecbb63c20058a909c1de56572b17fb8a96fd36ee35e81ee8163422508dbdf6c31d21e317bff332bcaa00bf7b6ab42e465210019ea70a25feebd3ef2c5a030 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b
-EBUILD cryptography-vectors-1.7.2.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
-EBUILD cryptography-vectors-1.8.1.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
-EBUILD cryptography-vectors-1.9.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
 EBUILD cryptography-vectors-2.0.2.ebuild 633 BLAKE2B 5ba6d226f28599a4d150471cfc004c6a1c9f36ffa7258c19be485ded145266a6558e47fc155506e20e026ea0ccb139b2d8866a319e30c2ece6061c837d23ca11 SHA512 245ab5c5b17930fa85039307428ba2138484831b8dea4afb382425ce13043d66addc3d4616e5b40aec13d11dc8870c9e0b244d2b5abff87ca43b4b6660662ba6
-EBUILD cryptography-vectors-2.0.3.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
-EBUILD cryptography-vectors-2.1.1.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
-EBUILD cryptography-vectors-2.1.2.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
-EBUILD cryptography-vectors-2.1.3.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
 EBUILD cryptography-vectors-2.1.4.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild
deleted file mode 100644
index 711276fa7749..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index f35f0b904d4b..391df40b318e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,24 +1,8 @@
 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-1.7.2.tar.gz 420867 BLAKE2B b1828ae39105d8a43d1f9edd5f34d5a5fc67b9bc7b1f2c8a206941d19c8aece7ec18613d912cfc3d17c00857bf3636c3e46c044f58c60f16cccc32d03521cd55 SHA512 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5
-DIST cryptography-1.8.1.tar.gz 423560 BLAKE2B 201af4b018bd989d0f2e0faebe4c352395430dd49e6ef915132f1f2322d335de39fc294e6d603a1c7f92fa0db58f92fef90f1a6ed33fa8e70be95a59a3bfd933 SHA512 273c8ca4ad6c9d1151a8a731d148d02e619e14e37df25dc26030b0a90f895b88fbf4d3e320aec5ea7af4a8fcc58f720c61f48968f912c69156d4e0e794743345
-DIST cryptography-1.9.tar.gz 409664 BLAKE2B ab75e24ad1b0f5422c32b7cd399b9094a602abdf74a74a2e4c494084dad6c6adbe88184f444d8d8fb3ed56fdd2922b9db8e5ec2e12a3d596a7f24b773496a705 SHA512 815e9c09366935f8603a3e6e74c28ce79175596d00dbcd19d3792505237bd1cf953a4f401c2b97e4beaa7f2bbdcf9d7f95c4753d001a07fa816830af97cdd24e
 DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
-DIST cryptography-2.0.3.tar.gz 427544 BLAKE2B 5ec83f469baf986ae4f4f167f017062282a66f8efd4bc84c3e90b493aab5ea0c61eeffb6c5fc06a23526949b29a73fd0b933ba2e4502bd618ff0eccb3559e294 SHA512 fa569c4f5a994e2bd90810649fdf48115bfd5ff46790c849991e8f7a7c8b5435402f92453e4365426ee645623b3bb509c9bb781657c4b4e81e3a36b58ba5461c
-DIST cryptography-2.1.1.tar.gz 441477 BLAKE2B b677413639fae99df1208d88da4c1aa6a5bdd2dad302828d07da236a37138d9732644f934e966d905f2b943dfa453368429dfdf7c254ab204b61194763b91258 SHA512 d021f7af1cb4c6430049d2213405b7bea84bc0bde9e9f92c99c87dd835b2f28eb28024d65090756d2cc72b63510f25d71c55e473ce00e1d24736c15037998adb
-DIST cryptography-2.1.2.tar.gz 441439 BLAKE2B 6b7d251c2c789701febe6820d396100e488329ff4ff01935ee6198e5565c85eca8ddb6a8090d268a69792c21c4ce9b2e189414f4f55435f5b772dd9b975a4a4b SHA512 a5a1bf7ea60f172ae72816965a471be00ee092151c02d9d792579a4457cceddd181d5d95fb832752981f9bdd3cfb88a5d531562845b0b70f37b39fb0fbcafe85
-DIST cryptography-2.1.3.tar.gz 441502 BLAKE2B ed46c2884905edaa18cbc0e2b93bea811a0fd660fa762170fe193903cba6a38ce4e41ec8b3a03b0d9748fc0676ba9cedde1571e2af5bdf14088d6cca19e175e2 SHA512 04b340550955ab177e3ca3b63ad39f903cee8ae12d3dee1039507e09b9257210ea4474265cb521b8f93a5ccda8dd829640ed04bc16bb7e3663651e64a5bbe8e3
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
-EBUILD cryptography-1.7.2.ebuild 1748 BLAKE2B d5567061692b4b08c99b11f3eb1251074c58cd463b56c0f46ed6609bcee14f54d47c1591bc19c4d8e8a508770e958f39ed4caca47e2e0eb2c54966854501a0a5 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9
-EBUILD cryptography-1.8.1.ebuild 1675 BLAKE2B 07dbff835901aa406b1ad41420381b67a8864bac69a6f672840268cf24192dd5e08e9c02d97d53f136ed430a8d0011e0027d81a8fc9c64bbcb9181a9f5001015 SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b
-EBUILD cryptography-1.9.ebuild 1646 BLAKE2B 97b9c20488de941d0b0eda1ac4ea65174f8218045d36927c16d76af8621802322c2436cd86d65442ea616fb1e19d9ad81eb446172b73b6dab1685d13c4381573 SHA512 a239da1f7e7397cf9153d9ecc5edd49e8a1c18eeaa884a73fe2f592408bf514f19af738202aa81905f55997e5e70b5643a71856db7ff4ea4be63151eda3bfeb0
 EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B b1da2d228a2b5804435e978ac073d15373d4a1ce1bb56b277d3eb8f66ff99410d5b8903cc0ffc620ac933f556b7fea9ae932a02db5e249c8384ba7a7990c3f59 SHA512 ab34101a8b2556703dfd1d4947aa9c42b85489c3556e558ce0e78b0ed685c00d836f4a349c623b78c5e1d54f92156d982bcaa9f54b04c8f960f447b5be390bdd
-EBUILD cryptography-2.0.2.ebuild 1542 BLAKE2B 56ce6022e9674edebd25ad7ee1df7252957686ef07c484a39af85d7fa5491432bb8f01f07313ac4b5393c50b4a13b842bbd9e0923111d0b1be581d5a3a7b3a87 SHA512 51a737cf880345dc75a7973870dba1971e8f35fba61b744bc4c352a643feedd9f342729e483383dbe4c0dd2b729d3564274bf57c77a35343143b70bffafdca1b
-EBUILD cryptography-2.0.3.ebuild 1646 BLAKE2B c702f3d9de77034c098e512ce4c3b6632f3d309790be1c9444bff9bd482d39c7c2cce6a188df406a72f04dae71cd82a1dbcef93989eb4c1dc4ce2993bdcb1cc0 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966
-EBUILD cryptography-2.1.1.ebuild 1646 BLAKE2B c702f3d9de77034c098e512ce4c3b6632f3d309790be1c9444bff9bd482d39c7c2cce6a188df406a72f04dae71cd82a1dbcef93989eb4c1dc4ce2993bdcb1cc0 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966
-EBUILD cryptography-2.1.2-r1.ebuild 1748 BLAKE2B 442a1ac096c5120355a51039fc06f5b7328d1b457d2bb6506caf884a334e0405ef823a89f43f817a01b2518304d20c6a162026918d12c2162f995cd7710fca9f SHA512 4fadc4dfdbd084efc7d375adf8e11b2b4cb429e26bda0ea9227298d30b1879d8e3609208afc7395af0370b072f334ac00ba7e172fa095636bda249e0e62441a1
-EBUILD cryptography-2.1.2.ebuild 1646 BLAKE2B c702f3d9de77034c098e512ce4c3b6632f3d309790be1c9444bff9bd482d39c7c2cce6a188df406a72f04dae71cd82a1dbcef93989eb4c1dc4ce2993bdcb1cc0 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966
-EBUILD cryptography-2.1.3.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba
 EBUILD cryptography-2.1.4.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-1.7.2.ebuild b/dev-python/cryptography/cryptography-1.7.2.ebuild
deleted file mode 100644
index 8bd074b43526..000000000000
--- a/dev-python/cryptography/cryptography-1.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-PATCHES=( "${FILESDIR}"/${P}-libressl-2.5.1.patch )
-
-python_test() {
-	distutils_install_for_testing
-
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.8.1.ebuild b/dev-python/cryptography/cryptography-1.8.1.ebuild
deleted file mode 100644
index abe8fa0ffb93..000000000000
--- a/dev-python/cryptography/cryptography-1.8.1.ebuild
+++ /dev/null
@@ -1,51 +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(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	distutils_install_for_testing
-
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.9.ebuild b/dev-python/cryptography/cryptography-1.9.ebuild
deleted file mode 100644
index bf2d5c3f6d58..000000000000
--- a/dev-python/cryptography/cryptography-1.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	distutils_install_for_testing
-
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.0.2.ebuild b/dev-python/cryptography/cryptography-2.0.2.ebuild
deleted file mode 100644
index c9d042f541e8..000000000000
--- a/dev-python/cryptography/cryptography-2.0.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,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.0.3.ebuild b/dev-python/cryptography/cryptography-2.0.3.ebuild
deleted file mode 100644
index 1c526d65add9..000000000000
--- a/dev-python/cryptography/cryptography-2.0.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.1.1.ebuild b/dev-python/cryptography/cryptography-2.1.1.ebuild
deleted file mode 100644
index 1c526d65add9..000000000000
--- a/dev-python/cryptography/cryptography-2.1.1.ebuild
+++ /dev/null
@@ -1,51 +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(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.1.2-r1.ebuild b/dev-python/cryptography/cryptography-2.1.2-r1.ebuild
deleted file mode 100644
index 70a0e57999bc..000000000000
--- a/dev-python/cryptography/cryptography-2.1.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{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
-										=dev-libs/openssl-1.0.2l-r1:0
-										=dev-libs/openssl-1.1.0f-r1:0 ) ) )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.1.2.ebuild b/dev-python/cryptography/cryptography-2.1.2.ebuild
deleted file mode 100644
index 1c526d65add9..000000000000
--- a/dev-python/cryptography/cryptography-2.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.1.3.ebuild b/dev-python/cryptography/cryptography-2.1.3.ebuild
deleted file mode 100644
index ab61cfd83112..000000000000
--- a/dev-python/cryptography/cryptography-2.1.3.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{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
-										=dev-libs/openssl-1.0.2l-r1:0
-										>=dev-libs/openssl-1.1.0g-r1:0 ) ) )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7a7d352501ac..3e8c1437a1ca 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,13 +1,7 @@
 AUX 0.25.2-test-cpdef_enums-L-suffix.patch 586 BLAKE2B 625addf1285b64abe19329cd41cb86f07d7988cd344b6cf69bb7515ef400a9546737970e7151a21813f6f6658b62cc2b0402113982631f44f2b730e68ce44867 SHA512 95e4d94250720161da9a08441201e76aaaf5477325950ccc1cb9df209b8e5eb77572d81b75ddb9f5733973578fcf44c17f5b2d8f7338badb664cb2f5659be6b9
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
-DIST Cython-0.22.tar.gz 1584483 BLAKE2B a221a922c6e22450499269c8756063a22259f21b8b422e72aede6fa80e6154ab36b4f94e54e246756d89b86c1f730d47ad2c7350ecfa61b26f57f4e40988895e SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267
-DIST Cython-0.24.1.tar.gz 1703756 BLAKE2B 92b1646d874adfd0a56cf9464f93e6215ee3be72693c814e2748abd6113362370e84af20941e92e10cac4311c4af822f899d8659975d5d9e398f969c1f746a3f SHA512 c5a3e884edd782c47c81aef29708035bbcd1c14d17e005668da8a4e26fdbba9af9ec283fd46ceaa2cab6fc4ec0d42f7d409832d7cc0a3ec00e84b968b1bf27ea
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
-DIST Cython-0.26.tar.gz 1692039 BLAKE2B ff1c6366dd224de31de373b341add34dfc2e3d9ef01ecf438b03aa96e7fca144ba4b68b90589f2ebf7bb6cd61f1e0166019bfac4a7b240950a6ba8a4bd626af8 SHA512 58b7dbdca3b1bdfcb8b968cb1b59826b793656bb7f1203a80b59b3fae2d3174cc99f19f88fc2ec175aa98c9daeca0eb3c52674a7889ba1e914fd20d19ef92aed
-EBUILD cython-0.22.ebuild 1773 BLAKE2B 63ce065a7bf13fe3a00bd75a425efe38a8d378d8a6cfdd7268a8bd833c23dd021469448b608c2acb0cdbe4f4ae72e7f1db8c0f2dc9b691a56b239887f8fd9234 SHA512 97ccebe31f21bef76efdedf686395afe23524aa692697c1b3ccc58db36cec26fa008d2bda9542193905c89e7205706e75bd1b633999f9ddfad8696e0461790ca
-EBUILD cython-0.24.1.ebuild 2078 BLAKE2B c8f6f6f20ee056c08a36be514373523a61a952f63f3bcab08078e0969ae87ca3890f76874519cdae1485818044f6974ad7131a78ed300ef26fd20ec78b07e6db SHA512 90c92bf91dd95b555d10eb46736927d0d06c0f6f919c931f778873821c20fefabb9b717b2e08965d68ede1d9e8d371aaf5ba4432e010f7764dca2d3db53731dd
 EBUILD cython-0.25.2.ebuild 2145 BLAKE2B 11562280269e2416643c28fa9264971494c2ecb881e6ed9c74faf87f5c48bec0b4c90ffd60610f5126c70f30e66eee89344e54ee2c0b43156b1e96e020a5210e SHA512 e8a5842dffcfb0b53680f2b717bb001aa416ea4eb94bc45ba6e79629801688e9d4059bc46223d8e66081d167a0c01913f6e9e48efac4d3dc05c55be20fd77cd2
 EBUILD cython-0.26.1.ebuild 2087 BLAKE2B 92d6965b7db472e34b41ece57a57a2bca20c8b1834d62b5cba0406f0396f670aa9681c005461ecf78b35c1b9b031a529e9d892c8a482914f5f62ba2dc9a57621 SHA512 c0a9731653608723a577f0fc53b3f418bb9f20d6300bfd0992a6767bc1353c640c2004f7f2df0f60b2b7fe404e4b5cb91ace10bb874293d7288cca4664280116
-EBUILD cython-0.26.ebuild 2087 BLAKE2B 92d6965b7db472e34b41ece57a57a2bca20c8b1834d62b5cba0406f0396f670aa9681c005461ecf78b35c1b9b031a529e9d892c8a482914f5f62ba2dc9a57621 SHA512 c0a9731653608723a577f0fc53b3f418bb9f20d6300bfd0992a6767bc1353c640c2004f7f2df0f60b2b7fe404e4b5cb91ace10bb874293d7288cca4664280116
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.22.ebuild b/dev-python/cython/cython-0.22.ebuild
deleted file mode 100644
index ad25b03c6954..000000000000
--- a/dev-python/cython/cython-0.22.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=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=""
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( Demos/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cython/cython-0.24.1.ebuild b/dev-python/cython/cython-0.24.1.ebuild
deleted file mode 100644
index 1b46d1f93fd8..000000000000
--- a/dev-python/cython/cython-0.24.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.26.ebuild b/dev-python/cython/cython-0.26.ebuild
deleted file mode 100644
index 7599fb5e7e1f..000000000000
--- a/dev-python/cython/cython-0.26.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index a1709096de79..d434298e3af0 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,5 @@
 DIST dask-0.10.2.tar.gz 357356 BLAKE2B 6d00529eb550de682221875d8c4fbf4c0447168b6c87327b02d0320cdd37e6490f67e7f0a09f814b9cdb453080785b011cdc50ba9b063c6569b4825833df92b4 SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2
-DIST dask-0.14.1.tar.gz 500509 BLAKE2B 849172a1cb7c2ae8a958aeb66b640c50b1ec0270c001013d280042a374c17f0b3b9de888ea7154b17ea84e7a6ae43d359d46ab82598ce10fa01ffdb3c3be4478 SHA512 a0f49e5337ea30bf5344a7e34ffdd2e1b64afb256372aa4b1095ad016f2c840d00672233da0840e25030c7a57c3841eca8bff9a4182a412b33351280bd03c0f3
-DIST dask-0.15.0.tar.gz 2141796 BLAKE2B 89976c60575c5a87999d79fd9909f0b49a05b6ada395a1e96c74a28b12c9605cdeb50aa82d530f3db7489d956a95b26200282dc740af895dba872a0337632fdb SHA512 676dd33276f229aef088f168e71ab792a4ee8aa48dc3236fde647b8d6fdc1f29075664c65ae05008217fa3602472e2eb1de0fc51ab872f37c9257505bd8da086
 DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 EBUILD dask-0.10.2.ebuild 946 BLAKE2B c07be78c3879641077aee95e11be90880e27e81eab40a849f81fe44491556a3b000e5ec34a32094acc55239ceafc7c046eca49d8c2bba331979311e9d878c2b7 SHA512 611c1b6d68e0f6c74f90d2063d69e3b3e149aa0b95596c71b1cece2f8c1fb5e9fb5ef971ac857943d2e19eb52924152acc82150a45ed2bad59e2d14ed1ba46a9
-EBUILD dask-0.14.1.ebuild 953 BLAKE2B 2026f79722f3f7a28054c27236d1fd13c58823eed9805c5af6fc1f0d3a4910854b1383c6937bab211111736db9bb85eeb2f06ef8ff927c7ff692ff70e2c80d23 SHA512 b00ecdf7cb0a0189a2a015f3775dda0a68cef7e7241cb72d9be5c6d49f9e208a50992ac403a012bd8b93db45fb893ff3cdde48d118d71a22d0ddb8cc24e214d4
-EBUILD dask-0.15.0.ebuild 1020 BLAKE2B 5bc73c13a2febedf3cc4466eee1d895457596c68b2d9669b39d115ec6f54dd89b871cdfc439d476eab0692f6be19613df94de4eb117adfa0f22e4a001f03d35f SHA512 d3854894ce73c6477456b93358114c03a3650feed25ebe0a830ad96a4f9a5c19ea50bcb9e1511ab4236659241047979134245c946a773a803d8f29aa5a74fa43
 EBUILD dask-0.15.1.ebuild 1094 BLAKE2B c0fcf8b4f499b24712aee5b3d9c104dc054d420834ae84d7fb768cdfe592e2dc906d8ca520892ce8f1fc6314adb03163200874c84c56f61fcd6d40c80e0052c2 SHA512 2c93a8711136504fc736fd1b16171b741485b37ad095095aa78e26046e4c742f6f33fafa2eb54158e95914d4ff5b777815fa8637ab77f493904737971223c38a
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-0.14.1.ebuild b/dev-python/dask/dask-0.14.1.ebuild
deleted file mode 100644
index 2ddd31089de4..000000000000
--- a/dev-python/dask/dask-0.14.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="http://dask.pydata.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"
-
-RDEPEND="
-	dev-python/bokeh[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/partd[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	   dev-python/numexpr[${PYTHON_USEDEP}]
-	   sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/dask/dask-0.15.0.ebuild b/dev-python/dask/dask-0.15.0.ebuild
deleted file mode 100644
index e020242bf401..000000000000
--- a/dev-python/dask/dask-0.15.0.ebuild
+++ /dev/null
@@ -1,40 +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="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="http://dask.pydata.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"
-
-RDEPEND="
-	dev-python/bokeh[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/distributed[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.7.2[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	   dev-python/numexpr[${PYTHON_USEDEP}]
-	   sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 9db48714c03f..9b6fcf2eca1c 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,5 +1,3 @@
-DIST ddt-1.1.0.tar.gz 6155 BLAKE2B f9629e6d69e520552c7ce69f74b0f71c063a6c773da4a7ff30e3e476778f8ccd95422d00641a0537aa65cd7de6d888050c5b174184d0deae2c562927ae28ca08 SHA512 86e8ffa8fa3a4d2c550898bd64201c3ea26de7692063e3076f5339d5731b9fdeb2d0aea772ff0702c2c359a291836e6486d97e8faa8874e1ebdb7ac9ac3b0385
 DIST ddt-1.1.1.tar.gz 10021 BLAKE2B b2024bb214bbc13b585ebfedecec32e3e53072a9c82ac2355625ba0e8a77159cc8e3c3d86788b5da4319f9ba6afddd61086b1b305ae7e2b9bd71edde139b7185 SHA512 3839ac0448292bde07d676456640cd9466353e8c4481e60cb51e33704c21f92fdf840901430aa7f5276ccf579a7cd70b277fa2ceae03bce183e2422d514897a9
-EBUILD ddt-1.1.0.ebuild 464 BLAKE2B 6d9ec52e116434f559b017b7bbd69fc76fb54daaae176a158b7e47722fe183deb31eda65da59721ef957151693b7c157d71ae80d7d5ab60fabf40f9a8ae4516a SHA512 38a46566d3aae3133cad85aa2eb0e764dc2a12021fc939a494ec48ec1b62bc9c2873384b88ff09468a30e71433dd786a5ca5afdd06ac7632ff3adc7aea5f0279
 EBUILD ddt-1.1.1.ebuild 625 BLAKE2B b90ebf63f85eb0abc47a6c82b4159507d50cea2c58954994a27eff80ed5db806f7b8313ce31afc2251c5f5c96b96b73e7fda9ba1cb32d5aba1094b9bb9609d8b SHA512 3102b6e00df0cfe4946cf510d8e7402b89383198e3b82903e31b8b1b09669256fb1802cbbf7dceaf1a8e6dbf1c623b330c17ddda71a1cb6a4efbb2b5676b0963
 MISC metadata.xml 731 BLAKE2B a3bfcf8b61d030a5b8637c1c913e999ac5ac960333bc56bc7fd20edafa538a0b679f818677a5a32b3a6c06e8cf5d42e120b89b76c4c4dd7db47e989cbc252a2a SHA512 71dcc2ff9b9b0f152a361e56cff5151c43d16a7517c26982e0af5133fd2ed953f38976ec75fdfa7e2b138e8d8d3d983777392438f2495a188ed9a5fda9ed4538
diff --git a/dev-python/ddt/ddt-1.1.0.ebuild b/dev-python/ddt/ddt-1.1.0.ebuild
deleted file mode 100644
index 8195ce682ad4..000000000000
--- a/dev-python/ddt/ddt-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +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="A library to multiply test cases"
-HOMEPAGE="https://pypi.python.org/pypi/ddt https://github.com/txels/ddt"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index c4d50f1b9b1c..af086fcc7d02 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,9 +1,3 @@
-DIST decorator-4.0.10.tar.gz 68560 BLAKE2B 85de8f13d0f766154412a8e6b6352354fb8bfc35fd3c5d03149b0863f0862d0d92447602cad88d47fca78e67887dc31336a98ad569d14e25c36e5a2f1a874a39 SHA512 612c2eafe16536c9b5eda07ea44999d868decbc38beb4207ab3f82325bafd346c431f9c9028f63bbf24573300a81dfb9446a51dee50bb34dc8b478088a541f73
-DIST decorator-4.0.11.tar.gz 70616 BLAKE2B cd8beb1062a209813ca70a218d4857d1d9d2fb8516149dcd44a246c2974450e64ecdefbd192f529bf3fb1af14469179e5b5742c18dd619d038d5aa7782edae4e SHA512 acce545d26c05ad03e4a3889214c3e94d1d47a9ccba42318ff8acb4d9384e676839fdcdb8d501a808f9332f532e4087a60398c273a58e07dfbc02f04f04af69c
-DIST decorator-4.0.2.tar.gz 64850 BLAKE2B 58ac424bc0dd6bf4494ccf23fa237011379a820c64833e42f57d428614b2094957b92467db715f7c199af17968b10e77b604ebe202e281f18ede8fe2f4d454eb SHA512 9f135c9c624557a90619e46002f12d54f8c53045420f524bbc52dee0b488268501467b207ea8f4445a8aa7d119af3e615cd76cbc25c1d1335d3bb581a1045ab3
 DIST decorator-4.1.2.tar.gz 32325 BLAKE2B 19754506bf18f03748d61fe3cf85e13e91f5a7b4b3550cf087b1c9506fa2d10a4fb6c32914f7c2078a74ac34f5ffaf0edf8b15aa1f46d2eafa91926c40430dba SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff
-EBUILD decorator-4.0.10.ebuild 810 BLAKE2B ddbcf97d8ce73ea196edc62bbbbbc42563451b0091c3edbf7b1ec4dd78ddac0703b072ae138b03b082add0a36867ca0e36e3b30efc12aafe75c721901a8737c3 SHA512 c146e7fd6a27a049e749151f957e73ba20cb0d35373fa206f77d82fc9329a39578e1f8900c1d5d24f01ce2d7cb64ced0f174398d30fcd9c47bf0fdb84c20b2ee
-EBUILD decorator-4.0.11.ebuild 825 BLAKE2B 39613d9b2cc10b80f5898338eca43b2823e5f486ca3d3eb9b233e283b64ebec9cd9b3d5826ed4a4cf6c301d0e8851ababcba4e17c2ab49da414876991872e094 SHA512 ee2ff15f8f5dc1bb00625a0b9847f9c04e4bcd35a3ca18454c909ab785c910e0cc10a7b7855c35ed4f70b209fb42d31ff5c943a782d9f713e2c4bf985f3d41eb
-EBUILD decorator-4.0.2.ebuild 794 BLAKE2B c2d1be2c4ec969cf4972b49293f8bf7f1f0f31fc6c82828df99e59e7426c30d1d2092d1eb565ceca4bfc57ceb48d5c4265b0efd91cce1b29331f4ce9cb4e517c SHA512 90091d12081d46d90a9d59128b84405c54f92b2236410ec0386bb514c4162c442ab0369ebd16fb56aefe40ec872ba7cb005c704ff8695d5ef6738844c8d8c2ba
 EBUILD decorator-4.1.2.ebuild 779 BLAKE2B 0ad88b13cfdeb0eb6befdcd8b36f69614996b22e33c7d673ff67bd452315e5ba7c866530312144c044b43720119a7cd80f70ed29b89649962e1cbcdfdf357e03 SHA512 3d7c25b08f05a10c23b8301e89008ec40f1855b569e083bcf110934927a4273ec27e9f888df186494131883a92429315e7ba2dfc24eb2340c72453b060f5f512
 MISC metadata.xml 665 BLAKE2B e73aef85a2fa36e50a503bb86e9eee781fc10a3cf9419afcccacb7ae282ed957027cf905e9b056865a13ead6319571ce4508029c08005762dd813ec07d7e1265 SHA512 c368940486c27fe99f5ec094929db337680227ec74dcdc6a45a173d3163a1e0cee9d6830bb2ac531c17b48cb2f32f3dd7238d666748f856b01e3ed4af77d0aac
diff --git a/dev-python/decorator/decorator-4.0.10.ebuild b/dev-python/decorator/decorator-4.0.10.ebuild
deleted file mode 100644
index 9e4800ec9dc2..000000000000
--- a/dev-python/decorator/decorator-4.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://pypi.python.org/pypi/decorator https://github.com/micheles/decorator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc documentation.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/decorator/decorator-4.0.11.ebuild b/dev-python/decorator/decorator-4.0.11.ebuild
deleted file mode 100644
index 4fd7970cccc4..000000000000
--- a/dev-python/decorator/decorator-4.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://pypi.python.org/pypi/decorator https://github.com/micheles/decorator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc documentation.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/decorator/decorator-4.0.2.ebuild b/dev-python/decorator/decorator-4.0.2.ebuild
deleted file mode 100644
index f438984520f9..000000000000
--- a/dev-python/decorator/decorator-4.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://pypi.python.org/pypi/decorator https://code.google.com/p/micheles/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc documentation.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 1d78af036336..44ed54285f66 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,5 +1,3 @@
-DIST distributed-1.17.1.tar.gz 376088 BLAKE2B 5817b192fb8771c514eaf0f9b4a89331dd379ba90e3f5952da1a256bb19dd17cf67d0a8c73a2de3880975f885e0a25b169085f23ad2c3eb01a6e21ad3d989f73 SHA512 e3addbdd18165ca00879829e98993b5e5d466dfdfa9255a668725852256b2bc6bca80ca42c63744ef3988d66d61bfc43258a83e7445158733d511d27aa68c64a
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.17.1.ebuild 1294 BLAKE2B 7ce5baa5b1c54a2e54564b627b1c63ddafc067a0dcea3d581e6521b07a1b190116c3a94a9173e9a2fef34c24e1069decb4cc6771fe6aa4ee9139827d9b8fdac8 SHA512 562b2c7df46655a93ed03217405cc45d8062b8e5ece3fa57d51c13dcf526f85285fc4d19de05e3cfa973c092d212a1c610ab9cdcbf1b2e1086cb0a8b92f087fe
 EBUILD distributed-1.18.0.ebuild 1318 BLAKE2B 7d60792d40208925cb19f5cbcb2351549ac62d1b1f0a8a7a40d18a0a3bdae4cc0e7d407bc2560adfda3135263385ca944e1cd566226a1ad7ad97ef3d213bdabb SHA512 ffcdf66d5cea2b3c6178198052ccb6089c54fecba1b4f7cbff57177317314b78bb4e97e376f3f736238b52394ae350296b608fa14ab844f5ec6114e789f1fd26
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.17.1.ebuild b/dev-python/distributed/distributed-1.17.1.ebuild
deleted file mode 100644
index 0ed247fb69a0..000000000000
--- a/dev-python/distributed/distributed-1.17.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for distributed computation"
-HOMEPAGE="http://distributed.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/dask-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.10.2[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcollections[${PYTHON_USEDEP}]
-	dev-python/tblib[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.7.4[${PYTHON_USEDEP}]
-	dev-python/zict[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	   ${RDEPEND}
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	py.test  -m "not avoid_travis" distributed --verbose -r s --timeout-method=thread --timeout=300 --durations=20 || die
-}
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 386d5cdec48c..46f7972eaa23 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,5 +1,3 @@
-DIST distro-1.0.2.tar.gz 27787 BLAKE2B 3acd2fab6d119839db4a383f0337db46d35917622168f6d128b1520049693072e56aa35a4ac6048ee274a0a1eb5c39180ae3df70804b045cfaa8a89775073f7e SHA512 df29ca40c1e7dd6e370396ceca684f5ce41fe50450faea104132d0e5dee05a91a525db715835c7efbca020e9c2e063bde9a6da07967eda6bfa8180856e175abb
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.2.ebuild 464 BLAKE2B 9809757b90b3da6b5c86484e64b2e52211c1b73bc50f0fdfbaec3c7fb8dd88daa9e508f18dec845c68dd1f529f2522c5c8dc12419ee08d22d09fadb4a843b4ba SHA512 81cea1b6cd1b74144e0de8afab047065d5a7e3f61bdf5033f58c924441631294fcd2299f71a17dbed366585f59e540c6c5f3c1bd06f0c366b3d7417f8bb6b3f6
 EBUILD distro-1.0.4.ebuild 584 BLAKE2B a8891d81d850a655e87f3217bc89f7fa8b9f0a49e84f416ab46e050d8d87334a59d4ac3621b29a844ed9dfdcec6cb69a7262d038d0aa4193f0c9174050e0d4d6 SHA512 d201207a85c964cf3e9f611ca57fbf7eab21301d78db413077e3f60ca072633a4c78583584fd740d0a4b186890f409df994913b3056ae535b8aee6ab8a8bf8c3
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.2.ebuild b/dev-python/distro/distro-1.0.2.ebuild
deleted file mode 100644
index eb08f5a4b8a5..000000000000
--- a/dev-python/distro/distro-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="http://distro.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 2bc4e52bab8d..d53bcec685ba 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,5 +1,3 @@
-DIST dj-database-url-0.4.0.tar.gz 4015 BLAKE2B 269b7d341829801271b8cc4d592fd9acbeb712197855ff68bffd5742d247c969f88b35b6133866fd9f8916bd2d9f8ad44e1ad7b4e629c2abb2fc88200fc06921 SHA512 eea9a095f135adf7a197db949cb1ca067ff920c73fe62f510da4decd92aad7e0051bbabee4b92f0848ffc23ce6ee87ddaf0fb284b0cfba78ba0e3b5a367cccf6
 DIST dj-database-url-0.4.2.tar.gz 4268 BLAKE2B c9abfc50616baf8cff4f12c6ce2c3bc5914be231c67d23ef49c222f162109ae7ad730678c05d9596969d4dabc7d44a80711dc2fbc3e6bd74b99dd699ee554413 SHA512 d18fe4e0cd4073689759c302c22e0f128d4ed1103af99a1db4dbe645fdea601837131a3f8d215143dabda64903aaeeb4706bd2082810f904cc8e74b564c5f2e3
-EBUILD dj-database-url-0.4.0.ebuild 663 BLAKE2B 216d54054661dfa50b2492e88f9adf900f53bd8f54fe05714a18204a819cc1c24f6030f4594dc8c7eb9cb4febb479cd26bec21f9481266004aba5c35dc36855f SHA512 d5d02354864d9f3b55f00dff7195b50281b0956e2524da7b257c26ecc958cb26380aea392c5e815becaa989197c329ff1face7c7489200fc7fee05b0059b35c5
 EBUILD dj-database-url-0.4.2.ebuild 666 BLAKE2B e96a35263383c0ad8f0606dee7b223419eef525ccc54dcb1ff1ca89f7d81de491c2f77d8bad26b612789d9973e44451efa2cfbf91792fd50173c83b89deccd6f SHA512 8404b8088cdf20c64a13c89240a860e0d0d7fd0b804c8cf36292d7574601d2fce00d80b81bc83dd241088d1d35b64fb384eea8fccf5d7de82716c7a17c2781bd
 MISC metadata.xml 398 BLAKE2B 29d967c2376c10347e128d1e7cad28c9a8346b7ec4a1d616a121b676fd3d56b4c0a1b4bf890bfed47b3fb244d9fa0ae01bc28d8b4066fd9289c72a436db4f647 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild
deleted file mode 100644
index e0e150c7805d..000000000000
--- a/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Not contained in the tarball
-RESTRICT=test
-
-python_test() {
-	"${PYTHON}" test_dj_database_url.py || die
-}
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index b20fcc5564ae..0c656f2fe354 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1,6 +1,4 @@
 AUX docs.patch 713 BLAKE2B dabe5ab114ea18911e9f7de38040348405116486bcb0cb0eeca8d2dcfd4becbdc99ce3a306338b03987064a53adec5fa7acc310f81de8e76d68582d91148d335 SHA512 af930dfca53b0353c7d0af3671a924174b5c2d6dbf3da299a77dfd603e2a510724024e2d6b1d51cb2ad6d7edff3f1bef0813b7f12af1d7628f022e3ee4667996
-DIST django-appconf-0.6.tar.gz 14072 BLAKE2B e065a71568daf38994cdf943a0c4fd02801c394f64d042f92d724722d363f3e8d452bac897b6c3d5375c0e3a842e243e7934eb9d966276b7483d9fa067b364be SHA512 d2a4aea07eeabdc32ed85cf0625702f3e7861b82d1e47660f3761dedff42a3bd3bfcc54dc3d46072758bea1a34af160f7a908bf0925c05b7409f1224f4a7245d
 DIST django-appconf-1.0.1.tar.gz 16743 BLAKE2B 0f40d2bac6ca596c83dd67b1109c0a298d845a8091565aceb57230132004f634e9227aeaf07766a3e690feae9833ec1395bc6f409f4412648d8e7df4c2533ba1 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d
-EBUILD django-appconf-0.6.ebuild 1203 BLAKE2B 62d55ce98f2fadbc7fcb25fb72efa00724782318c18354bb66f58033c68574d4e927f278ce0fc43d337b092a17550203eba36e2c1d65709dcfa5be5c796f95c5 SHA512 bacb1748c0bba3e98c3ea70cea1e31ccba8bebd90b86e29cd112845b5b4c5c6f05bdda5001ba3dd150d34234b5a25aed6e6f2dd484e0e8dc9a6a2359e899a9ad
 EBUILD django-appconf-1.0.1.ebuild 916 BLAKE2B 89a770ee1a6510870ad1addc0e8b9c788f37b083cdbc11e4a5595d1a9723b0e90f44291f641afb9a1e0e48f19a52d020c6355b81a01adf3f6d598d5f841e7ce0 SHA512 1329a248e4818466539a59a1714ae067a360ca06746c9c58703d267c883d3e8a4d253564b0b31b079c63933c43c4a02c20ad8ce23e0e75ff6b4cd54bdb7ce322
 MISC metadata.xml 390 BLAKE2B 86804c4033e0cc6649e2d0734283205ec8390f6d2067b51945944c0bcc30744ce45d8ce9ec229e007901ad9e01ba874cdac2ac7c62d176cc10850c243bb694db SHA512 2fe634938c78aa61b5d8f2bbe6e5ef4144a5d15c3e7c91691048427fa604cfe7229b924a0196d5d95488ffaea568a4a4c218056ebd010a36ee2f6b339785c66f
diff --git a/dev-python/django-appconf/django-appconf-0.6.ebuild b/dev-python/django-appconf/django-appconf-0.6.ebuild
deleted file mode 100644
index 864e276edf86..000000000000
--- a/dev-python/django-appconf/django-appconf-0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/"
-SRC_URI="https://github.com/jezdez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/django-discover-runner[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd appconf/tests || die
-	set -- django-admin.py test appconf --settings=appconf.test_settings
-	echo "$@"
-	"$@" || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
index c3bd2406ec3d..914b373361ba 100644
--- a/dev-python/django-compressor/Manifest
+++ b/dev-python/django-compressor/Manifest
@@ -1,5 +1,3 @@
-DIST django-compressor-1.4.tar.gz 103414 BLAKE2B b9ba72dff76a621e47533c220175c01bd31612d53a75ced3c900201337697af254e86fb69394a12eab400f022e1a70d524467619e0ecfeace50c6552418a2f91 SHA512 620618675585248a38040d91e3c33a534758cc87c4b2cab16ac3d55f82e37be6d4d7058226f6366e14305465a29235e89acba937019cd28fe4285614797179e2
 DIST django-compressor-1.5.tar.gz 105855 BLAKE2B 18cd7d664a683c44674d89f714e36dc4c7c8f9412567c12b31bc563a16340a11ffc3c4e686fa8d360a40553989ed41aa208e71aa31d0bb2c5fe31f5d7c3261e7 SHA512 d6c7a04263895a4195754a49bd4831053186c99d6fdd07977c26059eb931c982bd3b60848311e8469ad0e0298204a5fc3f0e63697a5af5608abf0b76e521c797
-EBUILD django-compressor-1.4.ebuild 1738 BLAKE2B f178727aae467c8cb9826bc8f752eb018f1d11df954856bdd7d3fb4386668ef3ca2dfb60f8079fafad77030ef8bdd77671e29a3dd015853d5b7b976fa00a441a SHA512 508d4b808189e7b4bd6b5e77b8d27ad7e989c54d2be3f6561ffed7c07f43457c4b3f26155abb35debc7262203055f14eb269b7d9031b21f0e29532b99f4053c4
 EBUILD django-compressor-1.5.ebuild 1742 BLAKE2B 7489a8708c8a23d75577f48b2f28fb406c49c62cb704a3a6924afbed1b59db9d002e5db7640e35238cc261cfb2cc1ac68b5d4c5641d70b9a97ac0892af2c67dc SHA512 708665b08f576777dd3d666aa8bda2e07caadbb5c8d44f783aebe6c135d620ac4696a14630a41636fd3ef0570ec1f72fe40d947dcbc50ca8cd56aa80aaf7e867
 MISC metadata.xml 339 BLAKE2B f8fd408c82c6c7f9416a7bf9092555ddcf18c962ac83a379e95ef264d8e9a09837dc6527b0bb659dfb5565887348313d5fa4ef7a28e7e91e51d3f28a1afa2bed SHA512 41051f6aacf5ae785a36c1606b2df505fd6120b9d2d9a9864ec15a5c8e72a5350b81510b5aeac28267f62310e8c192b3338001ada21c4b8fbe183f80f1043bb2
diff --git a/dev-python/django-compressor/django-compressor-1.4.ebuild b/dev-python/django-compressor/django-compressor-1.4.ebuild
deleted file mode 100644
index ddef2f2c9f7d..000000000000
--- a/dev-python/django-compressor/django-compressor-1.4.ebuild
+++ /dev/null
@@ -1,61 +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 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-
-DESCRIPTION="Compresses linked and inline javascript or CSS into a single cached file"
-HOMEPAGE="https://github.com/django-compressor/django-compressor"
-SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/versiontools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/django-discover-runner[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/Coffin[${PYTHON_USEDEP}]
-		dev-python/jingo[${PYTHON_USEDEP}]
-	)"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# https://github.com/django-compressor/django-compressor/issues/531 532
-	pushd "${BUILD_DIR}/lib" > /dev/null || die
-	if python_is_python3; then
-		sed -e s':test_cachekey:_&:' -e s':test_css:_&:g' \
-			 -i compressor/tests/test_base.py || die
-	fi
-	set -- django-admin.py test compressor --settings=compressor.test_settings
-	echo "$@"
-	"$@" || die "Tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 74c0fb081ec5..967e0d6ddaa1 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,5 +1,3 @@
-DIST django-debug-toolbar-1.3.2.tar.gz 316106 BLAKE2B 41ca813e252d54096ae6077e247f36292d986a1ecc5d8e34bf856edd9f272e74d8078b6402aaa44805837b9dcbd762702b08502726f104f5363226b14ca668db SHA512 d1428f1f729a190ddbf3a260bc428d7a78421519be60c7f07ad3e7f3498414d4ac0ec64d5772fcf89d6521f83bd9226fae104c43b4f0ad4deaf7cfb427d24b1c
 DIST django-debug-toolbar-1.5.tar.gz 315928 BLAKE2B 8dde3c655baa6bd5f3b5d3ae0ba57b8c5746fc41bcfae9f506ad5c49ff64cdb51f0b9d67ee42695f884493cf21bd76fdcf943d88d97641b5d804d54c59163562 SHA512 9a421b80016bdaee8dd3ba2a9b7c3b788b54a4f464cdd5697e36536268e4d3d926bf77088a715e87f192dc8a20a100d8adac68c9c26a1191a5343e377240bf64
-EBUILD django-debug-toolbar-1.3.2.ebuild 1319 BLAKE2B d57eea6f38568deb6e9e12514d303ce96808235205c31b5fae12b15707b2f8357c818a2c878a01eb9ddcf93d14ba4a2e5f2ecde4eb1e30728cdd5596be5fc425 SHA512 65435949e68c09d600d8a2eda86430919ed8504b017e7913b0c33047c96f8d42c85b469a9410b34841566645597ad313a4ead3a49ff5433e0ef709111d5d75b9
 EBUILD django-debug-toolbar-1.5.ebuild 1322 BLAKE2B de0666c8f5f49be58740befc1ab95db4e0deb9110bc47bb26a35ca0fb196e8a71e23f4cfbdcfb4d6bd1591d7f41423a003e9761f5140ac3b52e7cf8db4d43168 SHA512 11bab07318c7fbafedb623c20b858af66b23db2a7d11b9f9c13c0821b52b23a63c7af2f6819ff530f6f49647aa23f59fffd562f3202c0a819edc0fbc226fabd4
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild
deleted file mode 100644
index 558b7505df84..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.python.org/pypi/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.10[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Prevent non essential d'loading by intersphinx
-	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-
-	# This prevents distutils from installing 'tests' package, rm magic no more needed
-	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
index eade8e2c8818..217a4b727133 100644
--- a/dev-python/django-haystack/Manifest
+++ b/dev-python/django-haystack/Manifest
@@ -1,5 +1,3 @@
-DIST django-haystack-2.2.0.tar.gz 155409 BLAKE2B 2fbb97b2af2a4b4ed0c3c9877455565811b4feb480b38020487cbd9b9be095c172781b85a2a3b0a4e202d06990699a8f2f215e10cde2472979c7181a4637f548 SHA512 7bc27965650a759874c7e90b332994930a9318a4ca01245b04ade97559a6a125655c8a4fc182a3bcac63dbcd4bce76e71950218dff3116d3092d96f94e63e137
 DIST django-haystack-2.4.1.tar.gz 160757 BLAKE2B b45fa7f3db1b90736090dcee3a044377c3906c212df6927f9b712b8a8e6d82e6ce5a56e6d85c32281ec98e8df2a256ae9c0ed9d91fc5f0bf45cf47a1cb55e064 SHA512 5d711e13abf3fa7db5cbac31ddcdc2842aafb844cfafd8bad792aca8dfae8f91fa7586af8aacf266bb12e02aa04ad9aecfe903ae40d10f72ba38e0c4b1b1b298
-EBUILD django-haystack-2.2.0.ebuild 677 BLAKE2B 2484f5036ef8ac73330f49ee6fc0df65146743db8888cc78f6c5dcefefa3e0e442b83fd93ad4beee657e2fad6f3a912c74d8c5f6af092f24ab4be453bd10f550 SHA512 812a32e2457cd77d32be50aa4319edabc414a77ff7b841b4b339f2400fee7ab0e1f8cb461342fdca3b0ddb026df42d4323a93b946b17d106497926227695844b
 EBUILD django-haystack-2.4.1.ebuild 1232 BLAKE2B 20dbaed4681fb2255a9db9eb78f92730b99ca335ddeba49491b27d3a23354ef4eb864b7eeba639515df449c7588683f4724eff8b9ceeceac8386657062b767ef SHA512 f79a0fd78642369f918b8671505ffd453f1edd3e56f414d9345fd00ca35bed17a1fe4ac8ab90209f38b95e5b5183bd338c3d31d489f983fd7fb5888fdeeaab83
 MISC metadata.xml 328 BLAKE2B 0bf2ad41ce29ce4889784f73dbbf4dda5b76abe4f066f178c926611a20d27e608cf94b30fda06761f4b26bf0ffd7a1ddb643b0348249d58f4e4283bcc44b89b0 SHA512 4e0c90a27864f5a2106e1b665b98a69de67b13bd03343b9c3b82eb2f7c8bca1f8cdc82245157d687148adca108ecaddfcb202440d4f049730375e4735ca92121
diff --git a/dev-python/django-haystack/django-haystack-2.2.0.ebuild b/dev-python/django-haystack/django-haystack-2.2.0.ebuild
deleted file mode 100644
index 8820d8c4ac27..000000000000
--- a/dev-python/django-haystack/django-haystack-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +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="Pluggable search for Django"
-HOMEPAGE="http://haystacksearch.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
index 5aa71e20bc4d..1d02776937bd 100644
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@@ -1,7 +1,3 @@
-DIST django-nose-1.3.tar.gz 25149 BLAKE2B 548d6cbf575b6e29e1375559285fe1e8231556fec7e68b762672fa5a94c127b13d609235048681de0bdee2fdb71d8e04fee491774fbfb6fb3ee7e68732b9b6eb SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f
-DIST django-nose-1.4.3.tar.gz 46035 BLAKE2B 6dee08e667b55560ff36aff85d3b5e922a6e739c5fa39039d4bdc643c642eb83e1fa9ec7eba77dbe2de958d123c77d5d7abdd1839ef5ea15e87872000c015a1d SHA512 448ecfd9759811dc123cbc4bdc2e58e697f0f4c17caf9277fb5e0eb9215205d7814d45e86b2008e8a1233ddaf14e12112cdf64b0f5d54464ce77cbf896a48981
 DIST django-nose-1.4.4.tar.gz 44266 BLAKE2B 0c2785c98350b55df332eabb534ef3a614d961fffd8f44dd9e74c55a55e298b16c4963bfb389945fe76dc7ecb1e344104a8fe4afa35219ba748a8c7aadb97dc7 SHA512 b69af1e8539f7d792e6c9ef002cbeeee95bd144148d55850a49e2759784b68ce07e19587365beb06cc138136498c0e952f7b16067567a5a2eaa31e9f4d47b8da
-EBUILD django-nose-1.3.ebuild 677 BLAKE2B d2ee6b89a5769983c233b55560e06a6227c0f3027ed7b8bcbaf071b58be5ba469b992faa630b984d8aacf7971232037e99de7dd23111f201ed97840496a91966 SHA512 ffb45665e298f7e6e807b3f68b81d0217971550a4ec8658f73da275a00f4dd4e27ff6e881cd69d96cfef0c0d4bc604637920c64039839b7ea063afe93baeedb7
-EBUILD django-nose-1.4.3.ebuild 724 BLAKE2B 9e92eb10e66892c28d9c2bec1ce6d19c95f03d816f496f26a9d650636d59b7c4c34851e9eed30975a0fd9e430497d0a4fd20f884a198bdf7ab37d531c9ed0c9f SHA512 bea0a77896385718d26c0aacecf970980056fb91aa458478fbcf70244edfb4b0d0acaaf6bf6845e966b0c599db12edef019f38d31973b0daeb30c654331679ad
 EBUILD django-nose-1.4.4.ebuild 731 BLAKE2B 1030f2bfb2eb44de3f81e9403aee8b38050a596bf6652b7af21ea285f0759317c6f86e7f08f766e9bf80d276d027b68e09f64b78773ee93729c8f3b62e4043a1 SHA512 1215cf5d44d48448cc9832a7534eab9da575ca68c48e9d45caa7327348b2c105588624e0718c7ffe22976c0538a537b630e278fbcf9b898b7c9108fe7a4659c4
 MISC metadata.xml 385 BLAKE2B 776c504bb1b47f0bf19fa7e138b0ebdab5b8007e151e43d317d66f4cc9f3e5c273b710efd02edb57a923a37a1ce898a65b45d81232a4badb3b2da6ef7f77536b SHA512 39479b284469c8d29f60d39a8900ac5894c207706c4f141c565a52694b0fbf69b08ac77ca0dae44ec724e0548fee5a160a5d194033f06a53dea867787160a126
diff --git a/dev-python/django-nose/django-nose-1.3.ebuild b/dev-python/django-nose/django-nose-1.3.ebuild
deleted file mode 100644
index 592dbe0c0901..000000000000
--- a/dev-python/django-nose/django-nose-1.3.ebuild
+++ /dev/null
@@ -1,28 +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 )
-
-RESTRICT="test" # missing south
-
-inherit distutils-r1
-
-DESCRIPTION="Django test runner that uses nose"
-HOMEPAGE="https://github.com/jbalogh/django-nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? ( ${RDEPEND}
-#		>=dev-python/south-0.7[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${PYTHON}" testapp/runtests.py
-}
diff --git a/dev-python/django-nose/django-nose-1.4.3.ebuild b/dev-python/django-nose/django-nose-1.4.3.ebuild
deleted file mode 100644
index 2034487062cf..000000000000
--- a/dev-python/django-nose/django-nose-1.4.3.ebuild
+++ /dev/null
@@ -1,30 +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="Django test runner that uses nose"
-HOMEPAGE="https://github.com/jbalogh/django-nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-#RESTRICT="test"  # The testsuite currently broken See notes below
-
-RDEPEND="
-	>=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	./runtests.sh --verbose || die
-}
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
index e1616b2d3ad1..f6d8e53da018 100644
--- a/dev-python/django-picklefield/Manifest
+++ b/dev-python/django-picklefield/Manifest
@@ -1,5 +1,3 @@
-DIST django-picklefield-0.3.1.tar.gz 10410 BLAKE2B 8302bbace4ef53e6972afea28bcfc00318566f4c7d4727acb87439b76fde83a21befb00deb26cdd21dee35b240c4d3d86a104a99a827d2006373f2eeba82e992 SHA512 47e9aa8fda2374672c29dcb1068c9bddb0630bfc95cab401aa611123d1eeb3380f42efeee833542e187e052622d60aec1affb1c43cd96e9e69aadc187feba098
 DIST django-picklefield-0.3.2.tar.gz 9715 BLAKE2B d9a92ab8bbfa6af7fb6df18cc9b0d47e73183f9df7f7d6970cfbda8ba6b05e55b177660c97da9cd5c4337f4eb8effb635f6ecf0588c0dfb78d50750f8609df8b SHA512 4a6f3c3cedf3d44d232e5801a6041309949dfe551429ddb06535c97148010b14dd40ef6a4a8f1c126a35185732ab319dff53d14da243933ac3de561ad15c0c2b
-EBUILD django-picklefield-0.3.1.ebuild 559 BLAKE2B 5546f58dc3613833a76c06768431d40d1eff0c6aab97b5e74f45e4e1fecf560e0deec136f3e521e96073f84b0150f60b545ea2e1a804604e620598b44b5c84de SHA512 ba819da9e9dba0c4e12077b935b7b78435515233869fb8a93f2961e0a5131dd27044d6f62de8f059477e1467070d849c9baef8b5b91e9c6ca3ec75db2e39b6ed
 EBUILD django-picklefield-0.3.2.ebuild 567 BLAKE2B da02e83a914169bec237518f583f1bd74e4c4917043bc9dc3befbc075b36c19abee70f30a094b79a8312393209571ed15cc10f12a5db04da71237929519bab5b SHA512 8b844fa2a4fd33abc293fe455796a01df5e280af2b433dfa680b051b2ea06ef54a76fcaebe034feb0e5fdd0370bc0c96c0d59af83e029012b87f9e4cfab2e5ad
 MISC metadata.xml 405 BLAKE2B e0c40e9144178d8e10da3b9a7a81e948c3d1cba633d31e10d8f654f3111137088485bf8685d5d20635128ab1ef767ae8e89bd717e1d8289b925d73a0275ddb99 SHA512 4f45e449d39c68d5bc139928042b1f94bafa15caf2626c871d03168df95faf3da9b3ca21e16dc61dcc115027823d0a92c38ebe9269ccb7e1c9285ebcea04f449
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
deleted file mode 100644
index 700cf57bfc8c..000000000000
--- a/dev-python/django-picklefield/django-picklefield-0.3.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of a pickled object field for django"
-HOMEPAGE="https://github.com/shrubberysoft/django-picklefield"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index ede4648f7bea..7fcba45c7717 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,6 +1,3 @@
-AUX 1.3.26-tests.patch 4195 BLAKE2B d1ebbbd87fd55634c54c92c80b07e33da95e56d6181ca5b72ba2a5e23ab8e60002d6df1dc8d6cd41dc82cd58b03eb520c5f497ee3452e7597ed007e763594b14 SHA512 1eef360d23f0647319aeb4f4157318c6b91f3ee0bce34f9afb9ea82f74d57aa02328bdde066d0e68b56194301dad483f962436fdd349694991d1f9334d9fc13a
-DIST django-pipeline-1.3.26.tar.gz 41054 BLAKE2B 0082186d742b0fd965546e7aba8275b2381c34239a164f73c8507cafaa68ba9f242c281dba27896bc080f43f28c731fb36dbbb83449e2976acaa593981f1b08e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284
 DIST django-pipeline-1.6.0.tar.gz 41822 BLAKE2B 4917c527103522114b31afb0e9dbdcb202b0181d6634eaa4baac632a05c0ecab4502a3d4e13e97413268db582833df71f3f6df088b07ae8a354574331d2a9026 SHA512 4cf89f34a56aeb7cd5042617c265fb4bccfe7a0c32c26d50a0820d35c18207cdbf68b43e8f51ef7145fc48576ae0fe0a21553a75ec8a0a21a3c62e7699268d73
-EBUILD django-pipeline-1.3.26.ebuild 1481 BLAKE2B d62f9331160b5925ad1cffba894ce2ceabef74614eef5eaf502b32e75b49767e8fab81dc267727cf2d31b4d17bf3ea4c600655431ae3dbed67b4a9e0d8dcbfbb SHA512 c84cb9b8ccfe25850ad1d883b335ff1efa4f81dd1a538fa46c0bc8f06393b16b950634ec02774da851265b3bfb927492df4fa306601e047fff03cec4cc8d8d07
 EBUILD django-pipeline-1.6.0.ebuild 1444 BLAKE2B 0a48b1959b43aa29a8535a059a7ca3ddefea6c6fd7cb48c1bcb67e947651d484daa8a3f9018d4bc5aea8ffbeb440481403234443608f132fd5a14d8bf6c17daa SHA512 771b9af45df176258f07a850a21d87402bc1fb678f77ef5d784e41df66e38dfb648a10e302daf19d012012530bd310df1dffd3d16be7b673f363e4b7b7412cb8
 MISC metadata.xml 341 BLAKE2B 63efd8486a9e20bc6a8f085295595e8c3cbc389bb3c0153ecd6ccff6c17835f00cab2a34a22005148d84e0e900d3f6f6bff055a6c691eb83d014e459654798e9 SHA512 7cef597f45253dd0e25392fbb3bd20090ef6a522d506380be2a925948275bbf2348c5d114f84020ad132e84c72d2dd125fd487d591eb33d45a137d0be215ff09
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
deleted file mode 100644
index 5f1e37ee8775..000000000000
--- a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
+++ /dev/null
@@ -1,54 +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 asset packaging library for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
-
-# PyPi releases lack docs/ subdir:
-# https://github.com/cyberdelia/django-pipeline/pull/254
-SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PV}-tests.patch )
-
-# As usual for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# https://github.com/cyberdelia/django-pipeline/issues/381
-	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
-	distutils-r1_python_install
-}
diff --git a/dev-python/django-pipeline/files/1.3.26-tests.patch b/dev-python/django-pipeline/files/1.3.26-tests.patch
deleted file mode 100644
index 5cdf5e760c96..000000000000
--- a/dev-python/django-pipeline/files/1.3.26-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/cyberdelia/django-pipeline/commit/ba7b8d0d1cb621521a2025fed3e60786a010836d
-diff --git a/docs/configuration.rst b/docs/configuration.rst
-index 4385e23..e200bc3 100644
---- a/docs/configuration.rst
-+++ b/docs/configuration.rst
-@@ -185,7 +185,7 @@ Other settings
-     (
-       (b'text/coffeescript', '.coffee'),
-       (b'text/less', '.less'),
--      (b'application/javascript', '.js'),
-+      (b'text/javascript', '.js'),
-       (b'text/x-sass', '.sass'),
-       (b'text/x-scss', '.scss')
-     )
-diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
-index 84b6957..a303d03 100644
---- a/tests/tests/test_template.py
-+++ b/tests/tests/test_template.py
-@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
- 
-     def test_package_js(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
--        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_async(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
--        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_defer(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
--        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_async_defer(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
--        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
- 
- 
- class DjangoTest(TestCase):
-@@ -64,16 +64,16 @@ def test_compressed_css(self):
- 
-     def test_compressed_js(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
--        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_async(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
--        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_defer(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
--        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_async_defer(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
--        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
-
diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest
index e45909534058..eab647cfb5d9 100644
--- a/dev-python/django-recaptcha/Manifest
+++ b/dev-python/django-recaptcha/Manifest
@@ -1,5 +1,3 @@
-DIST django-recaptcha-1.0.3.tar.gz 11268 BLAKE2B 8f79a7f3f0be334fd68da009fd8af251e70eb92b839a294f3cfe3b700844b32f8e1b8f13ac800e173248254015f9d833ba550db61e09a5c8e49d84e0beae87fd SHA512 9288ba1b4145dd6a08f39d226eeaa5f9ea6d9ff63714ff497fe808dfbe249918e4bb67790566044bceeb59ed293a8fcfe4fb41e279b17b2d7a0a0c5a53dd6463
 DIST django-recaptcha-1.0.5.tar.gz 12827 BLAKE2B d17799e891c083adb005de488b4d8f3d7113c4440296d2b0ba5d7a29bc0177a85543dda84511a7a80e82781133bc13be6eda63ac22ba7e471ed7e1a41a662b99 SHA512 2ccf0a6c25d242d86ef7e89705d3f299c94c0ee2fc40853db9bb8cf1f7397650dcde85f1a6d995d452d432ce947bd8fa850d64334d4c124ddc9315cab6fe222c
-EBUILD django-recaptcha-1.0.3.ebuild 731 BLAKE2B 1f212431b19402e5899442f11b22d1a2dc27de444913037fe6c16c3cb956c33d02bb5e3a548b8d1e17fa2a35f675a961268c8c25c10fc8e7bdc19770afc278e3 SHA512 62c612558d0b3a57f266cdbc81e2e9d9cc135e6f938aa9cd49bfa11424e1ffe1ea5340a7cfba4ed02575a8654ecdd6644292ba7664c60dc85b6b0c55fdb05d59
 EBUILD django-recaptcha-1.0.5.ebuild 741 BLAKE2B fccb73ffd4fe138dba14f949dcb89c2cbc44f7961526f2d2169492ef9f6bfdc238d364711b5c1d77525f7c1ea6334edfc0b820832bac48e799aeff28f26e54c5 SHA512 8769d828f12937749a27d2733ed5f7033dd1ff5e2ac0a316e18b85d8b9f218f760828a94554f9ebe044eb1786c51f93239d882793b7c535542a45db378a3474e
 MISC metadata.xml 384 BLAKE2B 0b35dcdb2b5e934a3ca8ec179c7ae62b6810dc53ea51a58f1fbc5f30c9487dc0a3afc68f4183c3688a950115a00a867c77044f6df7e7d97f1b4bf7c915abc343 SHA512 ada7280319fd9fafeb8c9096a472bf88d1d49508733e7d847f08e33cc084f73dbd304af6be1725610127bc1ed054dbe66b74c6a3faf5c20520d4ea8d4e2087c8
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
deleted file mode 100644
index 9e4ffcbabd3d..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
+++ /dev/null
@@ -1,26 +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="Django recaptcha form field/widget app"
-HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.python.org/pypi/django-recaptcha"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/django-setuptest-0.1[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest
index 10c24c3bc03b..05a3d9929ca8 100644
--- a/dev-python/django-setuptest/Manifest
+++ b/dev-python/django-setuptest/Manifest
@@ -1,5 +1,3 @@
-DIST django-setuptest-0.1.6.tar.gz 6929 BLAKE2B 45485de8f104b398a00e01dc160915359279c940e4dcfd32989fb15964d6f2ac794764e460fd0cc61b80b920f9e36465e986bde3fe2fd3395710db5689eca266 SHA512 c2f2c1329d3541ac2e8d5895ddde2e1d1d1c2a819b3cc7168d333894e15128ff49b973a1570917abf06152634c915dada6df9f27ec9463ef79f02411c022d80d
 DIST django-setuptest-0.2.1.tar.gz 7131 BLAKE2B 5afd3106c9f02da2b8d63a21e90c68db97a38f67ca36feafa6e798f9f3106f81cedc94a3155d777f78f43e549fb5656245518d5a812fb30513c59cb24d8da98b SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d
-EBUILD django-setuptest-0.1.6.ebuild 644 BLAKE2B 5e4df1a0ef0025853ffef4da4dd05c40b026b3a8d6b87d743bba0c26960e8dfd2cfc51b73392cabdeb0f14981e0f0b088e7675636cc97bf1c2a289188e8f40ca SHA512 ea01542e119c5c2d2ba48cda00a7894c001ca86e2cecfa866c5763800709b520aae7cd2d8828215d1c72b6e03b1e68e696b1f9f918c67711a8635613817b4820
 EBUILD django-setuptest-0.2.1.ebuild 652 BLAKE2B 0e930f11dda0c1bbcec950a8cb5a119fd62e44ee28e8130abb431a78e9603f396acd22b5ea7e8841307e9bd6b91aac269c2ba8b362ee10d1cb49227f2e1ab9e2 SHA512 1e67b0c8e890c706d73a94c0b5f9f417c9a21985048c006267c247082e913028e57c2421682fb47b97a871ee71f9eccdf07c8dd83db702d3cb8b3a7c29ada50a
 MISC metadata.xml 340 BLAKE2B 77a7f56243e6f2266bb49641cfff0dd28418e4b9c9d9f89dd1e20bfdb9e3ada356288f2ff2d18b925a42701f4d0f77d7773eef117b1ef88e59d4b13341c698af SHA512 8c5b08f7e63678f303781866e98bc65821f09f296810a1b3ee891adf7c3a6cbca4202a85b0f28490cb79f17e7e452cd977a874187d9f18bc6ce341d5819a1fde
diff --git a/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild b/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
deleted file mode 100644
index b2656baad4a0..000000000000
--- a/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple test suite enabling Django app testing via setup.py"
-HOMEPAGE="https://github.com/praekelt/django-setuptest"
-SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 8802b44dceb1..9bab0e6651d8 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0.ebuild 722 BLAKE2B 7c74e4a4cc0557fa1c8c7fb14bad854f579c0146740ec1a0799bc852c66db03c89d5024d8a095af679b2207621fe623c40bc5a53aec7d200f438f3e11a0f9b21 SHA512 7a5e90796b6053bd9c896a020fab7a403e16caef53178514d03091d37adff472eb70eab3a388dd73ba9441a7188284ea6b4326861ada789ebd43f255c857f5e4
+EBUILD fields-5.0.0.ebuild 731 BLAKE2B 1052a2582fbf534c8ad666bbb7dcf48a1c7740d471f78ed6428bfc7e1f73f208d8b1feb4419491afd389fc907232255c3998056bed0e7ba5019fa37778c6920d SHA512 70c4bdc7b40559f2e97d62179b54c15131d1726c989355d0a322b4b50db1df0c7f5277698fbc02212865d28079046c1b315e0013e19270926774b6a9f8233811
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index f9032a554d89..963fa32d3f22 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="Container class boilerplate killer"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index a3e35cac1390..81380ffe82b8 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,12 +1,5 @@
-DIST pylint-1.4.4.tar.gz 342461 BLAKE2B 5d9be4634e87305f38710dd85601ba385262754dcd63b68bb779a6c9a655d048ffe3a9ebfd96ea8fbf467aca40dcda449076ffe882e65d3605e4964221d00331 SHA512 bcbf5439628a071055cea441455f6c0fe0cbfae2617c473bc376b880421f17f78653901d7cf49950653436a0991a3bafbc2df15744ff24a3b059de53e518b331
-DIST pylint-1.5.6.tar.gz 425251 BLAKE2B ffcf510681bcbbae0b6ac41e28f06132d026a8318cf989681262b7a8d03f97c207a381315a7c7af6ede6cea6c75dfba09d8ced8893277012addf9ce9829300eb SHA512 569a747a0d2c4f60ff2c16af6117f501fa1a9a6546fcc1228909b23024e2bc05951985acf56249919b67b11f161cb1855321115ad9fd7a7c409b71faa5dd8278
 DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
-DIST pylint-1.7.1.tar.gz 489108 BLAKE2B 7c14e2f2a3d85a33b98a1cacc487d75f4c2362e158f28df773f4dad4e06c88ff783dfb6f898a6c3bf75d73e7915610d6d5e45b007bc0723405282481e3a61879 SHA512 e0efbaad3ca3205a2e2e1e4bc444e635540db12e139e008ff2ca8b454dd117488e767f070126074389d6d82c17622da747b9a948711225246877fed69ac81148
 DIST pylint-1.7.2.tar.gz 488628 BLAKE2B 6f2902bdd18939f251515d652d2e9df43162c1b0c27c2e2ed7392ee77be9e7f81bbd62cede4f2eb1e7aa646bf47c48b01436e04cbf46a20458a1c89eff752d9d SHA512 268f141f017fa4df6024596bcf1dfb32a578e9459864e2ace8c2725c8f5e117e0b01d9d745f1632bb43102a01f7075dc3fb69b839b79371f7df47740a56fc1cb
-EBUILD pylint-1.4.4.ebuild 1756 BLAKE2B 21ac6472c49de347165dfd75e9f950ac4e0ab82497253bde66c0efc248e4e4bb2e8df26e438fe2999ecd19e96eedf6f7681754ef8bee0e91d3cabb27a5c9e9c0 SHA512 1fb393fb79a0a38a121a0fa7949fcfc44fe9e41a9cbb49829f000d680d2d42a583d5b7385afb809fea7c42b7eee79168531b52e02e87095e04b735b26f2918a0
-EBUILD pylint-1.5.6.ebuild 1671 BLAKE2B 2d216c6d5e454280d9537a5aaf3296333a3cba446190a1742f07dc265aa756d3c7ca6511b55cf1d48da0caf7d67c0e9b89a2e0063d674342b5c55d62b41a6d26 SHA512 834efffc0438edd33dd05ce00ff34b7c92f3b3296b4fbf1709b87e622bcd6e7908d04fcbc731d70c92b9c1c30e09305fa62511ee85b1e876584740b4b21434d6
 EBUILD pylint-1.6.5-r1.ebuild 1808 BLAKE2B a1db2fcb6e86958263388212da4e34773d91e9de7de8eea08dfeb63d932f9626e809990782084c98cc52869a85ab7375ccfcf8cd44318e892bc3f8468a2b3ae3 SHA512 30c46db64c4bb9b9d5998812a4ed6141806f3f65bb9db6337dec2b8a8bb2370c683ca63bfc61b6024bf382daeab1f04c780285b58bd530037c92b22bb38e9119
-EBUILD pylint-1.6.5.ebuild 1720 BLAKE2B c6c27066f1fe15e279539929b102f689ccd863cf18b13ccbf83dad02705aec3fed0311bf995986ca62da2ebe3e880c531e53d342b1e62c038b37c9d1b77a412e SHA512 30b539c069ded628fcceec28fc83969109b02ec8c4619c03fd0bb44176cfb184b7055d4b0fbac3f0bcbe6fa3fccf4f3f3eb5694d77b31b823f0502a959bbc775
-EBUILD pylint-1.7.1-r1.ebuild 1822 BLAKE2B 3cea5b3d56abd739b0cf26c29e3bc919a8622fbc5460fc71b93886d09c689356ffca9d17bae7f5d89e5e6d906b8f5eb09fc0b8d7f8ce3c60661d6f28ca6da2d0 SHA512 d5bc3bed59b7566bdbe499608240f4f429f9d08a4ff053c85000e2f7f3ef4d616ebf9a169784a03abbe8128c849fad3e3e34566401711706d6aeb9e43cc08356
 EBUILD pylint-1.7.2.ebuild 1873 BLAKE2B 36b160c2f5f5719404f33b100fc8b41f7db3e361fd216defa3a5e50854693c421f50155aa8026558a2e52ee258b87785eb91f095cfd82189d930c8972770b664 SHA512 1d86c62a19d06ba93f20ea35b8b1f06e0f993a6d57cb8c328d5f82e96d477c4bb1baf56759894ccf4fcb5852cecdf5e1207c676b3fc01d41aecbaad1c8e28eff
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.4.4.ebuild b/dev-python/pylint/pylint-1.4.4.ebuild
deleted file mode 100644
index 30d279882005..000000000000
--- a/dev-python/pylint/pylint-1.4.4.ebuild
+++ /dev/null
@@ -1,61 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-RESTRICT="test" # needs pygtk
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="http://www.logilab.org/project/pylint https://pypi.python.org/pypi/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/logilab-common-0.53.0[${PYTHON_USEDEP}]
-	>=dev-python/astroid-1.3.6[${PYTHON_USEDEP}]
-	<dev-python/astroid-1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-# Usual. Requ'd for impl specific failures in test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	# selection of straight html triggers a trivial annoying bug, we skirt it
-	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
-}
-
-python_test() {
-	# Test suite appears not to work under Python 3.
-	# https://bitbucket.org/logilab/pylint/issue/240/
-	local msg="Test suite broken with ${EPYTHON}"
-	if python_is_python3; then
-		einfo "${msg}"
-		return 0
-	fi
-
-	pytest || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	elog "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled."
-}
diff --git a/dev-python/pylint/pylint-1.5.6.ebuild b/dev-python/pylint/pylint-1.5.6.ebuild
deleted file mode 100644
index e6fd948fc773..000000000000
--- a/dev-python/pylint/pylint-1.5.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	http://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
-	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-RESTRICT="test" # multiple failures
-
-# Usual. Requ'd for impl specific failures in test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	# selection of straight html triggers a trivial annoying bug, we skirt it
-	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
-}
-
-python_test() {
-	${PYTHON} \
-		-m unittest discover \
-		-s pylint/test/ -p "*test_*".py \
-		--verbose || die
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
-}
diff --git a/dev-python/pylint/pylint-1.6.5.ebuild b/dev-python/pylint/pylint-1.6.5.ebuild
deleted file mode 100644
index b8ad4438224f..000000000000
--- a/dev-python/pylint/pylint-1.6.5.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,5,6} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	http://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
-	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-RESTRICT="test" # multiple failures
-
-# Usual. Requ'd for impl specific failures in test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	# selection of straight html triggers a trivial annoying bug, we skirt it
-	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
-}
-
-python_test() {
-	${EPYTHON} \
-		-m unittest discover \
-		-s pylint/test/ -p "*test_*".py \
-		--verbose || die
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
-}
diff --git a/dev-python/pylint/pylint-1.7.1-r1.ebuild b/dev-python/pylint/pylint-1.7.1-r1.ebuild
deleted file mode 100644
index d2b95b6b8b01..000000000000
--- a/dev-python/pylint/pylint-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,66 +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 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	http://www.logilab.org/project/pylint
-	https://pypi.python.org/pypi/pylint
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/astroid-1.5.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-		dev-python/configparser[${PYTHON_USEDEP}]' -2)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# remove unused dep
-	sed -i -e '/pytest-runner/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# selection of straight html triggers a trivial annoying bug, we skirt it
-	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 943974d231e0..745390472b4a 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,16 +1,7 @@
 AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105fc46c03d66b65ad359e84d63780fdff36342b50a5465c4ebcfe1a94d277301de49e5f4822856411e54d939d85d7043a1f094 SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae
-DIST pytest-cov-1.6.tar.gz 8257 BLAKE2B b5d9bfd4ae36dc807fee2207e85c14c584247b289711863d4d6773b13afa139a8ed811e152f071c18f841ead89e4a3cb8f4098f7efb322c86d1bdf90d311b9e1 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f
-DIST pytest-cov-1.8.1.tar.gz 8649 BLAKE2B fa37c19ba4e74efdfc89410dfa0cbe8f886f5bb2be9d838fecba54a1ba4d772e5f71adc679b4e043f8a2de871edf0ca4d43978dbf08f2e684a03660a83ce1c2c SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112
-DIST pytest-cov-2.1.0.tar.gz 25992 BLAKE2B 06fdfe7958433831c80779092ec2add153f84f4aab0223aaa07a4dec68a6cc1fc190d104469aa13ba87687d27e61548fbb320eb47f4caab8b8e3e092e3bbd765 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738
-DIST pytest-cov-2.2.0.tar.gz 29965 BLAKE2B d4e5c522a50b5107d0ddede125e59e12d29ef02d4b7a2b4106918c5a2a418cf7e63de7cc4833f7b129510211411498febc2e04be83dade195f4ee56c7b3b2828 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420
-DIST pytest-cov-2.2.1.tar.gz 33154 BLAKE2B ccdd66c557b13921e63b2ab5698ec90ac58fe2297f4f7295d3d88fed72924b01cdbace742ac90f336b9835875c57aa609e8b0382b0e2c7b0482bc1add00131ee SHA512 8f20cf1c42b4415c7decf8407582e64045c599aedf1970160d02e35e723f56fa095af26ee4390eabf2d32e209898b0a3dae8b7212ac81ecda64d6dbc7c83f790
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
-EBUILD pytest-cov-1.6.ebuild 561 BLAKE2B a2bbdff8281b64d45312866ebf7b5e6eed8006f78ba172aba1d694d2c794951da0a53ef1453997ba582f1a4ae208cec948f0052d495895a15c99d2f88c851bbf SHA512 c4cf5ce68d840d1a8b2e5bb049b9bf2c9774ad1c841f9d85be94139feb4413963bd345bbce16d660a867e80dca79b5064cd6ada55fd5a5d6dc25b1f5d02756d9
-EBUILD pytest-cov-1.8.1.ebuild 959 BLAKE2B c1079b09b461f78f3e511675d5884207f382640c66b04849427459bd612a2f8cbf3376a448814f41d4a45beae66a678d7a2913bb79892a2ec056e100422a6c32 SHA512 84e384cc5afad709603bad3f02f65339b18e0f89e61dabe19d3e433cf399b7e4c8f4afcf4c6702241d936101e1431a8e05dad1c8ca107af3496fa7e6b621cacc
-EBUILD pytest-cov-2.1.0.ebuild 1087 BLAKE2B f84dac999eec7df501ea88b75694bdee654c3f08ffac31e4c1c91a7addb8128c49e45e372606bd5a7541ca78354ffa74fe47a035093182f07889024d88ac4ec4 SHA512 52f32df000e94f98826c7d21c29e1edf5ba800e794bbcc0c182d0d7c65b28697f06640df655a924e0ff3241efaf3fa4732446e9739ee155d887de90aac275c97
-EBUILD pytest-cov-2.2.0.ebuild 1262 BLAKE2B 4019d9581327811f975b595bf415d100f56406c174df3aa4ae6ecd3390727855911b12eab77f052b43a1029e2f11ddac8fd3a4312ea5264801f1263ce22e3be0 SHA512 49cd4aba05bb7f9e2f9b1d2a6385a0032f7befb056acc1242123879169240b4fac2d210764c2bf174548a2bb341ea260c530a2c6cf0a40db07ba4222f28154a2
-EBUILD pytest-cov-2.2.1.ebuild 1266 BLAKE2B 1594f406c42626561123e31e24be31533326b7fb4faaff1fb5cc62e4ff666afdbb79a8774d48da85ed583ecca83aeafc098ed8933d7770696b1a5b92cbcb9ecb SHA512 b3d295471bce26776e89c9922cd9cc806837eda10c855160e46889706262d8178d6456ec7b3ab3c4a3daadf4e88906c504dffa3c5168bf3be8057717f4ce79fc
-EBUILD pytest-cov-2.3.1.ebuild 1535 BLAKE2B 028de5ab74f11c17b3ba06a66ce7e7d1a45dce39cf36e74363e296ef9051d337a9d013699051d7e2f036fd867acd1d69490602f63919c009a94c23d79bd1991a SHA512 60e2b1992e2adf269352517948df3cca5ea08c91426374fd2e00abd6d8247eb2b5fa6458cadb17b951745faea029846157433d2e2cf770643be2040f041c7477
-EBUILD pytest-cov-2.5.1.ebuild 1505 BLAKE2B f4a515eafb4441ab47e36cfc58aa751939a0de2c6f01c06d5816b23544040c76afd35dfc2f294a9c107255a252157ccf843ecfd0f207d61c09be457665c36472 SHA512 edc8552f7d3c30b1b0cb26ee7cf2ef54f4d6ccc8efaffd35ae721c950271de3a98873d18b40c96c1aa80c2e43cc5541c35e338e52aef367a1b06d88b6c25a744
+EBUILD pytest-cov-2.3.1.ebuild 1539 BLAKE2B 2ef33a3cb6cb07cde3e5a756a7b25c1e81847675a409b35a3d81a4b77a7c5baa5b50dc98b83e3590434a2fa690de006fb4fb3a1e3de9eb21b339bc0c2a5e4a6d SHA512 4b2d0235e1affbd327df01544c6db6b807752aaece33f38bcbcbf66121e05967d8355784e91015b9183b51932008cd6ec984b90be2871b0fc6e3f70e17de2065
+EBUILD pytest-cov-2.5.1-r1.ebuild 1473 BLAKE2B 13f9ec208114cf0341baf7828b8847d4f5315cd09539ac4e0907c993773ba566db0de8f64aab4d427af0b5f7eb89512dc4b08e9ef7d69171da7e179222597b1d SHA512 19988adca17f9717bfba2b0a77104efc99de6c02126dbd95f7cd189478fadfc87e5b5253f0432f752aeba519218da55516622520175ac67de37e18f1e5db3270
+EBUILD pytest-cov-2.5.1.ebuild 1509 BLAKE2B 04b63690469fe1d6af9ac85add37fd75f2f90c4bf95b092efee26e2f85bf47ecb8693628f025621928b26887312a85202c4447708e0f6b116aa886373a01ccd9 SHA512 741f39ad5f2d63ca64cfdad5a2049783d79b1402184a6bb3ced95c894ef332f5b97b23b9c4224ab168f7965af13ce8ea0bfb766fefea7e7d7c153e2b9924230e
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-1.6.ebuild b/dev-python/pytest-cov/pytest-cov-1.6.ebuild
deleted file mode 100644
index 859701ba2298..000000000000
--- a/dev-python/pytest-cov/pytest-cov-1.6.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=( python{2_7,3_4} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://bitbucket.org/memedough/pytest-cov/overview"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/cov-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
deleted file mode 100644
index a21dfda7b9b7..000000000000
--- a/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://bitbucket.org/memedough/pytest-cov/overview"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	<dev-python/coverage-4[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# test_ file produces no output; For FI
-	"${PYTHON}" test_pytest_cov.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
deleted file mode 100644
index 5f44d70bde40..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	<dev-python/coverage-4[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-cache[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
-		py.test -p pytest_cov -vvx || die
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
deleted file mode 100644
index be456abdf404..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-		)"
-
-# https://github.com/pytest-dev/pytest-cov/issues/99
-RESTRICT=test
-
-python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
-		PYTEST_PLUGINS=pytest_cov \
-		py.test -v -v -x || die
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 5c7a0cdbf23c..c52df7375023 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 3eaf9819fc11..41e16e502292 100644
--- a/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,32 +13,45 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
 		dev-python/process-tests[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
 		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-		)"
+	)
+"
 
-# https://github.com/pytest-dev/pytest-cov/issues/99
-RESTRICT=test
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
 
 python_test() {
 	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
 		PYTEST_PLUGINS=${PN/-/_} \
-		py.test -v -v -x || die
+		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
index 72ead3a4d2c7..6b39b3c8c69e 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-hpilo/Manifest b/dev-python/python-hpilo/Manifest
new file mode 100644
index 000000000000..514911fa1fda
--- /dev/null
+++ b/dev-python/python-hpilo/Manifest
@@ -0,0 +1,5 @@
+DIST python-hpilo-3.9.tar.gz 177570 BLAKE2B 7442871e1d1d82010cb2ec6c2ff947fe2cd1b627a9920cd0fa6260f3efb4c85bc44d6fce7a0b967f3cd54cb1626f454584abab963eade9d6e7b67088114ce4fe SHA512 777b3d1f93da196e57b1359d6d5024c60d28d2ed88bc8e84c883aabcd3bfa68ace989b9a22975fe09279957b070a11637b5d943e923c6827eb29466d62cbdad5
+DIST python-hpilo-4.0.tar.gz 178109 BLAKE2B aa8d4f9f74c053cb65d6c1ae77602a045923250aa9e4e3d689aa305094bb91a3a100a365d28fbb5fb0b69887d27a00796ffa2d9ff9f5eb26800f18672f73a6c6 SHA512 5a084899275b169a753d93b599c6b0d4d46d695c1378bbea340740d9e654723ff44e85cb71213c2e6811356d826e3912598b18f0f1aaeb906f19b0fc3064fbde
+EBUILD python-hpilo-3.9.ebuild 485 BLAKE2B 82787326f5c310227034ba4560c6a6c17c06cf135c5ac7178edfad1f874a3a0ee8592de7b344d1dc6d8a81784650f6acdeac7d2f66e12326a2c804a641b50940 SHA512 001332261aef59488b46cf2930cdedcc208633a1ec6309651f48cdf00b04252677d8d933e2e885b38578d4a836c1751d917c43705fe5cb8fc70377d08bc1eb92
+EBUILD python-hpilo-4.0.ebuild 485 BLAKE2B 82787326f5c310227034ba4560c6a6c17c06cf135c5ac7178edfad1f874a3a0ee8592de7b344d1dc6d8a81784650f6acdeac7d2f66e12326a2c804a641b50940 SHA512 001332261aef59488b46cf2930cdedcc208633a1ec6309651f48cdf00b04252677d8d933e2e885b38578d4a836c1751d917c43705fe5cb8fc70377d08bc1eb92
+MISC metadata.xml 666 BLAKE2B aae5ef2572734016e24e84795420e0f8083b2c5bbb8357a49b1d90d0d273701c311c5feeb9df7f9141236f4c2eafbd8a708b01d79e1f2fc9e87244f93046ab15 SHA512 e177656c862474bdfc61bbd01fa3f2a06f4d136594491a9156c95082671066eaa7c00b570cdc0a6ae550ee6d98f62fc2569fa9129d66cfd9c8b3d1825d050928
diff --git a/dev-python/python-hpilo/metadata.xml b/dev-python/python-hpilo/metadata.xml
new file mode 100644
index 000000000000..ab62601285cf
--- /dev/null
+++ b/dev-python/python-hpilo/metadata.xml
@@ -0,0 +1,19 @@
+<?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>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		HP servers come with a powerful out of band management
+		interface called Integrated Lights out, or iLO. It has an
+		extensive web interface and commercially available tools for
+		centrally managing iLO devices and their servers.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">seveas/python-hpilo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-hpilo/python-hpilo-3.9.ebuild b/dev-python/python-hpilo/python-hpilo-3.9.ebuild
new file mode 100644
index 000000000000..a291d1ad427b
--- /dev/null
+++ b/dev-python/python-hpilo/python-hpilo-3.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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="iLO automation from python or shell"
+HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/python-hpilo/python-hpilo-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
new file mode 100644
index 000000000000..a291d1ad427b
--- /dev/null
+++ b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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="iLO automation from python or shell"
+HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 58bcc177b394..44c66c9405e0 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
-DIST sabyenc-3.3.1.tar.gz 16072288 BLAKE2B 65683ad93990fc40d2c782aef704e31424cd1a5bac53a95b6ff87283fde05cbaa172dfeabf0720d5388d7b56965054ab323efa14d4091854338e9105739a3716 SHA512 971a5936eb89c8e34d2a97d4a95a139584a8749c9f7172788c17cc1d184f460477da72e008d57a34ccc235867e0e5b4026b30ad229e31bb96f55a0b74da90263
-EBUILD sabyenc-3.3.1.ebuild 597 BLAKE2B 05aaba3f9959ebedcb210996d40a93a2dbfb949516d55b15f0edd939008dca31314579b2135188a54dd7c9545d0fb8862c08f2a0bb2f25fd3796abda83e77691 SHA512 ef04bfd15a693ea915396d025763efa2908daa826258d9532f7891066015054700bf5d3452785011d0e9ec4e1504427ca2f1f16f6b24ee39399ec6cabbab425d
+DIST sabyenc-3.3.2.tar.gz 16601738 BLAKE2B 90d55d23d785746666d05d1a674abf08e3dc0d913bf2f80f5f3e5e9007c1b6d1c0575e699b46ac4afca293dfb6b0357508652fee74ef3af18d2e317f01c0f982 SHA512 82d86007ea6802909203ca4fb08518426ce91723ede7a5c0b2a56d65f67ef00e8322a60b6571826c1aad78717b68398ece67e23ed910f7afd6db8adf42dc3ce6
+EBUILD sabyenc-3.3.2.ebuild 711 BLAKE2B dee9e5e9172716d3ebaccff763f4d86fc3364b165984d11b8d23ca5963e3fbaec8f33fe618851c6159b999ee147868f6ff0e3db864f0d090424087484fa8e2a1 SHA512 b8421c6d0047479caa00dabcd944f1f7ed2daecf84777a3a168efe82e9119787b81ef2a6219ff57aa950b051ffd170c956e33e751fbd50a343d8ec0cb6e248cf
 MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
diff --git a/dev-python/sabyenc/sabyenc-3.3.1.ebuild b/dev-python/sabyenc/sabyenc-3.3.2.ebuild
index 0a4c2171daf4..f464f4481104 100644
--- a/dev-python/sabyenc/sabyenc-3.3.1.ebuild
+++ b/dev-python/sabyenc/sabyenc-3.3.2.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"
@@ -21,5 +21,10 @@ DEPEND="
 DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
 
 python_test() {
+	# https://github.com/sabnzbd/sabyenc/pull/7
+	cat <<-EOF > pytest.ini
+		[pytest]
+		norecursedirs = yencfiles
+	EOF
 	pytest -v || die "Test failed."
 }